diff options
| author | Mario <mario@mariovavti.com> | 2018-10-26 08:15:11 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-10-26 08:15:11 +0200 |
| commit | 6326a50d2024de7c214d47befa9d8ff0a109f4ef (patch) | |
| tree | eaf7415849f0bb9711701f19b1dbedd9e8ae84e4 | |
| parent | 9cedc864c296ad3fb394692440551c97bc644522 (diff) | |
| parent | aef212ada9ff61326ae56c5c17ff8873b7cc4c69 (diff) | |
| download | volse-hubzilla-6326a50d2024de7c214d47befa9d8ff0a109f4ef.tar.gz volse-hubzilla-6326a50d2024de7c214d47befa9d8ff0a109f4ef.tar.bz2 volse-hubzilla-6326a50d2024de7c214d47befa9d8ff0a109f4ef.zip | |
Merge branch 'patch-20181025a' into 'dev'
Add entropy to queue worker - and fix requeuing of expired tasks
See merge request hubzilla/core!1350
| -rw-r--r-- | Zotlabs/Daemon/Master.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php index 3a71ee578..0656ca05b 100644 --- a/Zotlabs/Daemon/Master.php +++ b/Zotlabs/Daemon/Master.php @@ -60,7 +60,8 @@ class Master { $k = explode('_',$worker['k']); q("delete from config where cat='queueworkers' and k='%s'", 'workerstarted_'.$k[1]); - q("update config set k='workitem' where cat='queuework' and k='%s'", + q("update config set k='%s' where cat='queuework' and k='%s'", + dbesc(uniqid('workitem:',true)), 'workitem_'.$k[1]); unset($workers[$idx]); } @@ -69,7 +70,7 @@ class Master { return false; } } - return uniqid(); + return uniqid('',true); } |