We got rid of two workerqueue queries, yeah!

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 0f93c5e6d86182c79d4f27eb2f1ae860b91b4a1b..fe1ee63e06b37504138be60067e4b532f4b6d560 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -35,12 +35,13 @@ require_once 'include/features.php';
 require_once 'include/identity.php';
 require_once 'update.php';
 require_once 'include/dbstructure.php';
+require_once 'include/poller.php';
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
-define ( 'FRIENDICA_VERSION',      '3.5.2-rc' );
+define ( 'FRIENDICA_VERSION',      '3.5.3-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1226      );
+define ( 'DB_UPDATE_VERSION',      1229      );
 
 /**
  * @brief Constant with a HTML line break.
@@ -457,6 +458,13 @@ if (!defined("SIGTERM")) {
        define("SIGTERM", 15);
 }
 
+/**
+ * Depending on the PHP version this constant does exist - or not.
+ * See here: http://php.net/manual/en/curl.constants.php#117928
+ */
+if (!defined('CURLE_OPERATION_TIMEDOUT')) {
+        define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
+}
 /**
  *
  * Reverse the effect of magic_quotes_gpc if it is enabled.
@@ -985,7 +993,7 @@ function notice($s) {
 function info($s) {
        $a = get_app();
 
-       if (local_user() AND get_pconfig(local_user(), 'system', 'ignore_info')) {
+       if (local_user() && get_pconfig(local_user(), 'system', 'ignore_info')) {
                return;
        }
 
@@ -1055,12 +1063,13 @@ function proc_run($cmd) {
        $arr = array('args' => $args, 'run_cmd' => true);
 
        call_hooks("proc_run", $arr);
-       if (!$arr['run_cmd'] OR ! count($args)) {
+       if (!$arr['run_cmd'] || ! count($args)) {
                return;
        }
 
        $priority = PRIORITY_MEDIUM;
        $dont_fork = get_config("system", "worker_dont_fork");
+       $created = datetime_convert();
 
        if (is_int($run_parameter)) {
                $priority = $run_parameter;
@@ -1068,6 +1077,9 @@ function proc_run($cmd) {
                if (isset($run_parameter['priority'])) {
                        $priority = $run_parameter['priority'];
                }
+               if (isset($run_parameter['created'])) {
+                       $created = $run_parameter['created'];
+               }
                if (isset($run_parameter['dont_fork'])) {
                        $dont_fork = $run_parameter['dont_fork'];
                }
@@ -1080,7 +1092,7 @@ function proc_run($cmd) {
        $found = dba::select('workerqueue', array('id'), array('parameter' => $parameters), array('limit' => 1));
 
        if (!dbm::is_result($found)) {
-               dba::insert('workerqueue', array('parameter' => $parameters, 'created' => datetime_convert(), 'priority' => $priority));
+               dba::insert('workerqueue', array('parameter' => $parameters, 'created' => $created, 'priority' => $priority));
        }
 
        // Should we quit and wait for the poller to be called as a cronjob?
@@ -1088,18 +1100,8 @@ function proc_run($cmd) {
                return;
        }
 
-       // Checking number of workers
-       $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` > '%s'", dbesc(NULL_DATE));
-
-       // Get number of allowed number of worker threads
-       $queues = intval(get_config("system", "worker_queues"));
-
-       if ($queues == 0) {
-               $queues = 4;
-       }
-
        // If there are already enough workers running, don't fork another one
-       if ($workers[0]["workers"] >= $queues) {
+       if (poller_too_much_workers()) {
                return;
        }
 
@@ -1409,7 +1411,7 @@ function clear_cache($basepath = "", $path = "") {
                $path = $basepath;
        }
 
-       if (($path == "") OR (!is_dir($path))) {
+       if (($path == "") || (!is_dir($path))) {
                return;
        }
 
@@ -1426,10 +1428,10 @@ function clear_cache($basepath = "", $path = "") {
                if ($dh = opendir($path)) {
                        while (($file = readdir($dh)) !== false) {
                                $fullpath = $path . "/" . $file;
-                               if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != "..")) {
+                               if ((filetype($fullpath) == "dir") && ($file != ".") && ($file != "..")) {
                                        clear_cache($basepath, $fullpath);
                                }
-                               if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime))) {
+                               if ((filetype($fullpath) == "file") && (filectime($fullpath) < (time() - $cachetime))) {
                                        unlink($fullpath);
                                }
                        }
@@ -1446,7 +1448,7 @@ function get_itemcachepath() {
        }
 
        $itemcache = get_config('system', 'itemcache');
-       if (($itemcache != "") AND App::directory_usable($itemcache)) {
+       if (($itemcache != "") && App::directory_usable($itemcache)) {
                return $itemcache;
        }
 
@@ -1473,7 +1475,7 @@ function get_itemcachepath() {
  */
 function get_spoolpath() {
        $spoolpath = get_config('system', 'spoolpath');
-       if (($spoolpath != "") AND App::directory_usable($spoolpath)) {
+       if (($spoolpath != "") && App::directory_usable($spoolpath)) {
                // We have a spool path and it is usable
                return $spoolpath;
        }
@@ -1508,7 +1510,7 @@ function get_temppath() {
 
        $temppath = get_config("system", "temppath");
 
-       if (($temppath != "") AND App::directory_usable($temppath)) {
+       if (($temppath != "") && App::directory_usable($temppath)) {
                // We have a temp path and it is usable
                return $temppath;
        }
@@ -1517,7 +1519,7 @@ function get_temppath() {
        $temppath = sys_get_temp_dir();
 
        // Check if it is usable
-       if (($temppath != "") AND App::directory_usable($temppath)) {
+       if (($temppath != "") && App::directory_usable($temppath)) {
                // To avoid any interferences with other systems we create our own directory
                $new_temppath = $temppath . "/" . $a->get_hostname();
                if (!is_dir($new_temppath)) {
@@ -1640,7 +1642,7 @@ function argv($x) {
 function infinite_scroll_data($module) {
 
        if (get_pconfig(local_user(), 'system', 'infinite_scroll')
-               AND ($module == "network") AND ($_GET["mode"] != "minimal")) {
+               && ($module == "network") && ($_GET["mode"] != "minimal")) {
 
                // get the page number
                if (is_string($_GET["page"])) {
@@ -1653,12 +1655,12 @@ function infinite_scroll_data($module) {
 
                // try to get the uri from which we load the content
                foreach ($_GET AS $param => $value) {
-                       if (($param != "page") AND ($param != "q")) {
+                       if (($param != "page") && ($param != "q")) {
                                $reload_uri .= "&" . $param . "=" . urlencode($value);
                        }
                }
 
-               if (($a->page_offset != "") AND ! strstr($reload_uri, "&offset=")) {
+               if (($a->page_offset != "") && ! strstr($reload_uri, "&offset=")) {
                        $reload_uri .= "&offset=" . urlencode($a->page_offset);
                }