Changed parameter order

diff --git a/boot.php b/boot.php
index fe4e5a275701d54126aeb447c71981999aee9dee..4d57d21e62d92ba3cb72f6b05c753df3fa6430b9 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1114,7 +1114,7 @@ class App {
                return false;
        }
 
-       function is_already_running($task, $taskname, $timeout = 540) {
+       function is_already_running($taskname, $task = "", $timeout = 540) {
 
                $lockpath = get_lockpath();
                if ($lockpath != '') {

diff --git a/include/cron.php b/include/cron.php
index 1c3297c9322e87280ef114c552fbe9134a8fcc63..d68bd7f0845eca4c43b9ad6e3091efcbb14d5090 100644 (file)
--- a/include/cron.php
+++ b/include/cron.php
@@ -43,7 +43,7 @@ function cron_run(&$argv, &$argc){
        if (App::callstack() != "poller_run") {
                if (App::maxload_reached())
                        return;
-               if (App::is_already_running('include/cron.php', 'cron', 540))
+               if (App::is_already_running('cron', 'include/cron.php', 540))
                        return;
        }
 

diff --git a/include/cronhooks.php b/include/cronhooks.php
index 22812fb8643beed7dbc1c7b246f15e99d185de07..b6cf0e72378763d6b3e5ac697672dce67438ea02 100644 (file)
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -27,7 +27,7 @@ function cronhooks_run(&$argv, &$argc){
        if (App::callstack() != "poller_run") {
                if (App::maxload_reached())
                        return;
-               if (App::is_already_running('include/cronhooks.php', 'cronhooks', 1140))
+               if (App::is_already_running('cronhooks', 'include/cronhooks.php', 1140))
                        return;
        }
 

diff --git a/include/discover_poco.php b/include/discover_poco.php
index 8ba2bb2365afcfaf71350f6ade1217ab256944a6..0b468faea189e522505ed5c686facd22be905406 100644 (file)
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -44,7 +44,7 @@ function discover_poco_run(&$argv, &$argc){
 
        // Don't check this stuff if the function is called by the poller
        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;
 
        $a->set_baseurl(get_config('system','url'));

diff --git a/include/onepoll.php b/include/onepoll.php
index 4d270f6135a03553801109d118989c9b13140f02..eb1045de142957dcab4e08d8b66ff8aa3ecb4750 100644 (file)
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -61,7 +61,7 @@ function onepoll_run(&$argv, &$argc){
 
        // Don't check this stuff if the function is called by the poller
        if (App::callstack() != "poller_run")
-               if (App::is_already_running('', 'onepoll'.$contact_id, 540))
+               if (App::is_already_running('onepoll'.$contact_id, '', 540))
                        return;
 
        $d = datetime_convert();

diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index b438b36e6b959f3ed8d49d8a6ac31234b7d6617f..4fbb505146e830b91e1dd96560ebe6da084b6c7a 100644 (file)
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -80,7 +80,7 @@ function pubsubpublish_run(&$argv, &$argc){
 
        // Don't check this stuff if the function is called by the poller
        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;
 
        $a->set_baseurl(get_config('system','url'));

diff --git a/include/queue.php b/include/queue.php
index 1222199c70960c03f00abf8f3bdfde1d0bf83dcd..183ce0f9cd610ff80789e86c6cfc81a91f2a32b4 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -29,7 +29,7 @@ function queue_run(&$argv, &$argc){
 
        // Don't check this stuff if the function is called by the poller
        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;
 
        $a->set_baseurl(get_config('system','url'));

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index 25c11806a22a243fd59ec7f8b66a37060cc0bba0..88e1817f0b991ff6a0749c2d794b71510ab62b22 100644 (file)
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -38,7 +38,7 @@ function update_gcontact_run(&$argv, &$argc){
 
        // Don't check this stuff if the function is called by the poller
        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;
 
        $r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));