diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2019-03-14 10:30:01 +1100 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2019-03-14 10:30:01 +1100 |
| commit | 6a55500c1bc147986e01417724809b19eca92be9 (patch) | |
| tree | 07aea019a688d5803b830e0bc891569713a9fd64 /Zotlabs | |
| parent | 088a93e023aa23d089dad2a06d61b540d3ea47a1 (diff) | |
| parent | a5a5ac60ba626b0d863627e5f0144afbbaeb8e66 (diff) | |
| download | volse-hubzilla-6a55500c1bc147986e01417724809b19eca92be9.tar.gz volse-hubzilla-6a55500c1bc147986e01417724809b19eca92be9.tar.bz2 volse-hubzilla-6a55500c1bc147986e01417724809b19eca92be9.zip | |
Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Cron_daily.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Poller.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Zotlabs/Daemon/Cron_daily.php b/Zotlabs/Daemon/Cron_daily.php index f0351fcdd..dbfcff439 100644 --- a/Zotlabs/Daemon/Cron_daily.php +++ b/Zotlabs/Daemon/Cron_daily.php @@ -85,6 +85,7 @@ class Cron_daily { Master::Summon(array('Cli_suggest')); remove_obsolete_hublocs(); + z6_discover(); call_hooks('cron_daily',datetime_convert()); diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php index a8cf34ce2..84bf7e923 100644 --- a/Zotlabs/Daemon/Poller.php +++ b/Zotlabs/Daemon/Poller.php @@ -199,6 +199,7 @@ class Poller { set_config('system','lastpoll',datetime_convert()); //All done - clear the lockfile + @unlink($lockfile); return; |