Pumpio: Start the syncronisation as a forked process to avoid stale connections

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index dc4a6a420ed376c2b24d94c7ce1c2a17825222bc..95bc6b9f3ca37c9794e3f3e4e6457d1f9a05b62b 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -603,8 +603,7 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
        }
 }
 
-
-function pumpio_cron(&$a,$b) {
+function pumpio_sync(&$a) {
        $last = get_config('pumpio','last_poll');
 
        $poll_interval = intval(get_config('pumpio','poll_interval'));
@@ -667,6 +666,11 @@ function pumpio_cron(&$a,$b) {
        set_config('pumpio','last_poll', time());
 }
 
+function pumpio_cron(&$a,$b) {
+       //pumpio_sync($a);
+       proc_run("php","addon/pumpio/pumpio_sync.php");
+}
+
 function pumpio_fetchtimeline(&$a, $uid) {
        $ckey    = get_pconfig($uid, 'pumpio', 'consumer_key');
        $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');

diff --git a/pumpio/pumpio_sync.php b/pumpio/pumpio_sync.php
new file mode 100644 (file)
index 0000000..346376f
--- /dev/null
+++ b/pumpio/pumpio_sync.php
@@ -0,0 +1,66 @@
+<?php
+if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
+       $directory = dirname($_SERVER["argv"][0]);
+
+       if (substr($directory, 0, 1) != "/")
+               $directory = $_SERVER["PWD"]."/".$directory;
+
+       $directory = realpath($directory."/..");
+
+       chdir($directory);
+}
+
+require_once("boot.php");
+
+
+function pumpio_sync_run(&$argv, &$argc){
+       global $a, $db;
+
+       if(is_null($a)) {
+               $a = new App;
+       }
+
+       if(is_null($db)) {
+               @include(".htconfig.php");
+               require_once("include/dba.php");
+               $db = new dba($db_host, $db_user, $db_pass, $db_data);
+               unset($db_host, $db_user, $db_pass, $db_data);
+       };
+
+       require_once("addon/pumpio/pumpio.php");
+       require_once("include/pidfile.php");
+
+       $maxsysload = intval(get_config('system','maxloadavg'));
+       if($maxsysload < 1)
+               $maxsysload = 50;
+       if(function_exists('sys_getloadavg')) {
+               $load = sys_getloadavg();
+               if(intval($load[0]) > $maxsysload) {
+                       logger('system: load ' . $load[0] . ' too high. Pumpio sync deferred to next scheduled run.');
+                       return;
+               }
+       }
+
+       $lockpath = get_lockpath();
+       if ($lockpath != '') {
+               $pidfile = new pidfile($lockpath, 'pumpio_sync');
+               if($pidfile->is_already_running()) {
+                       logger("Already running");
+                       if ($pidfile->running_time() > 9*60) {
+                               $pidfile->kill();
+                               logger("killed stale process");
+                               // Calling a new instance
+                               proc_run('php','addon/pumpio/pumpio_sync.php');
+                       }
+                       exit;
+               }
+       }
+
+       pumpio_sync($a);
+}
+
+if (array_search(__file__,get_included_files())===0){
+       pumpio_sync_run($_SERVER["argv"],$_SERVER["argc"]);
+       killme();
+}
+?>