harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-master-rate-limiter' into 'dev'

Browse Source 
Fix master rate limiter

See merge request hubzilla/core!1341

(cherry picked from commit e38e85572e)

49eff772 Fix worker age calculation
be30dc9e Move logger to debug/all
b6a9be88 Delete duplicate queue items
This commit is contained in:
Mario 2018-10-16 19:19:16 +00:00
parent ba9b49bc83
commit 84d4036117
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Daemon/Master.php
View File

@ -53,8 +53,10 @@ class Master {
if (count($workers) > $maxworkers) {
foreach ($workers as $idx => $worker) {
$curtime = time();
if (($time - $worker['v']) > $workermaxage) {
$curtime = time();
$age = (intval($curtime) - intval($worker['v']));
if ( $age > $workermaxage) {
logger("Prune worker: ".$worker['k'], LOGGER_ALL, LOGGER_DEBUG);
$k = explode('_',$worker['k']);
q("delete from config where cat='queueworkers' and k='%s'",
'workerstarted_'.$k[1]);
@ -100,6 +102,11 @@ class Master {
$argc = $workinfo['argc'];
$argv = $workinfo['argv'];
logger('Master: process: ' . print_r($argv,true), LOGGER_ALL,LOG_DEBUG);
//Delete unclaimed duplicate workitems.
q("delete from config where cat='queuework' and k='workitem' and v='%s'",
serialize($argv));
$cls = '\\Zotlabs\\Daemon\\' . $argv[0];
$cls::run($argc,$argv);