clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed parameter order

This commit is contained in:
Michael Vogel 2016-03-08 22:28:49 +01:00
parent beb2346cfc
commit 65d6d45f8c
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -1114,7 +1114,7 @@ class App {
return false; return false;
} }
function is_already_running($task, $taskname, $timeout = 540) { function is_already_running($taskname, $task = "", $timeout = 540) {
$lockpath = get_lockpath(); $lockpath = get_lockpath();
if ($lockpath != '') { if ($lockpath != '') {

2
include/cron.php
View File

@ -43,7 +43,7 @@ function cron_run(&$argv, &$argc){
if (App::callstack() != "poller_run") { if (App::callstack() != "poller_run") {
if (App::maxload_reached()) if (App::maxload_reached())
return; return;
if (App::is_already_running('include/cron.php', 'cron', 540)) if (App::is_already_running('cron', 'include/cron.php', 540))
return; return;
} }

2
include/cronhooks.php
View File

@ -27,7 +27,7 @@ function cronhooks_run(&$argv, &$argc){
if (App::callstack() != "poller_run") { if (App::callstack() != "poller_run") {
if (App::maxload_reached()) if (App::maxload_reached())
return; return;
if (App::is_already_running('include/cronhooks.php', 'cronhooks', 1140)) if (App::is_already_running('cronhooks', 'include/cronhooks.php', 1140))
return; return;
} }

2
include/discover_poco.php
View File

@ -44,7 +44,7 @@ function discover_poco_run(&$argv, &$argc){
// Don't check this stuff if the function is called by the poller // Don't check this stuff if the function is called by the poller
if (App::callstack() != "poller_run") if (App::callstack() != "poller_run")
if (App::is_already_running('include/discover_poco.php', 'discover_poco'.$mode.urlencode($search), 1140)) if (App::is_already_running('discover_poco'.$mode.urlencode($search), 'include/discover_poco.php', 1140))
return; return;
$a->set_baseurl(get_config('system','url')); $a->set_baseurl(get_config('system','url'));

2
include/onepoll.php
View File

@ -61,7 +61,7 @@ function onepoll_run(&$argv, &$argc){
// Don't check this stuff if the function is called by the poller // Don't check this stuff if the function is called by the poller
if (App::callstack() != "poller_run") if (App::callstack() != "poller_run")
if (App::is_already_running('', 'onepoll'.$contact_id, 540)) if (App::is_already_running('onepoll'.$contact_id, '', 540))
return; return;
$d = datetime_convert(); $d = datetime_convert();

2
include/pubsubpublish.php
View File

@ -80,7 +80,7 @@ function pubsubpublish_run(&$argv, &$argc){
// Don't check this stuff if the function is called by the poller // Don't check this stuff if the function is called by the poller
if (App::callstack() != "poller_run") if (App::callstack() != "poller_run")
if (App::is_already_running("include/pubsubpublish.php", 'pubsubpublish', 540)) if (App::is_already_running("pubsubpublish", "include/pubsubpublish.php", 540))
return; return;
$a->set_baseurl(get_config('system','url')); $a->set_baseurl(get_config('system','url'));

2
include/queue.php
View File

@ -29,7 +29,7 @@ function queue_run(&$argv, &$argc){
// Don't check this stuff if the function is called by the poller // Don't check this stuff if the function is called by the poller
if (App::callstack() != "poller_run") if (App::callstack() != "poller_run")
if (App::is_already_running('include/queue.php', 'queue', 540)) if (App::is_already_running('queue', 'include/queue.php', 540))
return; return;
$a->set_baseurl(get_config('system','url')); $a->set_baseurl(get_config('system','url'));

2
include/update_gcontact.php
View File

@ -38,7 +38,7 @@ function update_gcontact_run(&$argv, &$argc){
// Don't check this stuff if the function is called by the poller // Don't check this stuff if the function is called by the poller
if (App::callstack() != "poller_run") if (App::callstack() != "poller_run")
if (App::is_already_running('', 'update_gcontact'.$contact_id, 540)) if (App::is_already_running('update_gcontact'.$contact_id, '', 540))
return; return;
$r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id)); $r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));