Removed the legacy function calls, removed unused functions

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 42767845c267b0089dcde159f91716ea8e78dabf..6c00462422182d511ef8dd1a7261088478425ac6 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -475,6 +475,7 @@ class App {
        public  $performance = array();
        public  $callstack = array();
        public  $theme_info = array();
+       public  $backend = true;
 
        public $nav_sel;
 
@@ -940,7 +941,7 @@ class App {
                } else {
                        $r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
                                $common_filename);
-                       if(! count($r)){
+                       if(! dbm::is_result($r)){
                                $this->cached_profile_image[$avatar_image] = $avatar_image;
                        } else {
                                $this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']);
@@ -1111,6 +1112,80 @@ class App {
                return($this->is_friendica_app);
        }
 
+       /**
+        * @brief Checks if the site is called via a backend process
+        *
+        * This isn't a perfect solution. But we need this check very early.
+        * So we cannot wait until the modules are loaded.
+        *
+        * @return bool Is it a known backend?
+        */
+       function is_backend() {
+               $backend = array();
+               $backend[] = "_well_known";
+               $backend[] = "api";
+               $backend[] = "dfrn_notify";
+               $backend[] = "dfrn_poll";
+               $backend[] = "fetch";
+               $backend[] = "hcard";
+               $backend[] = "hostxrd";
+               $backend[] = "nodeinfo";
+               $backend[] = "noscrape";
+               $backend[] = "p";
+               $backend[] = "photo";
+               $backend[] = "photos";
+               $backend[] = "poco";
+               $backend[] = "post";
+               $backend[] = "proxy";
+               $backend[] = "pubsub";
+               $backend[] = "pubsubhubbub";
+               $backend[] = "receive";
+               $backend[] = "rsd_xml";
+               $backend[] = "salmon";
+               $backend[] = "statistics_json";
+               $backend[] = "xrd";
+
+               if (in_array($this->module, $backend))
+                       return(true);
+               else
+                       return($this->backend);
+       }
+
+       /**
+        * @brief Checks if the maximum number of database processes is reached
+        *
+        * @return bool Is the limit reached?
+        */
+       function max_processes_reached() {
+
+               // Is the function called statically?
+               if (!is_object($this))
+                       return(self::$a->max_processes_reached());
+
+               if ($this->is_backend()) {
+                       $process = "backend";
+                       $max_processes = get_config('system', 'max_processes_backend');
+                       if (intval($max_processes) == 0)
+                               $max_processes = 5;
+               } else {
+                       $process = "frontend";
+                       $max_processes = get_config('system', 'max_processes_frontend');
+                       if (intval($max_processes) == 0)
+                               $max_processes = 20;
+               }
+
+               $processlist = dbm::processlist();
+               if ($processlist["list"] != "") {
+                       logger("Processcheck: Processes: ".$processlist["amount"]." - Processlist: ".$processlist["list"], LOGGER_DEBUG);
+
+                       if ($processlist["amount"] > $max_processes) {
+                               logger("Processcheck: Maximum number of processes for ".$process." tasks (".$max_processes.") reached.", LOGGER_DEBUG);
+                               return true;
+                       }
+               }
+               return false;
+       }
+
        /**
         * @brief Checks if the maximum load is reached
         *
@@ -1118,14 +1193,26 @@ class App {
         */
        function maxload_reached() {
 
-               $maxsysload = intval(get_config('system', 'maxloadavg'));
-               if ($maxsysload < 1)
-                       $maxsysload = 50;
+               // Is the function called statically?
+               if (!is_object($this))
+                       return(self::$a->maxload_reached());
+
+               if ($this->is_backend()) {
+                       $process = "backend";
+                       $maxsysload = intval(get_config('system', 'maxloadavg'));
+                       if ($maxsysload < 1)
+                               $maxsysload = 50;
+               } else {
+                       $process = "frontend";
+                       $maxsysload = intval(get_config('system','maxloadavg_frontend'));
+                       if ($maxsysload < 1)
+                               $maxsysload = 50;
+               }
 
                $load = current_load();
                if ($load) {
                        if (intval($load) > $maxsysload) {
-                               logger('system: load '.$load.' too high.');
+                               logger('system: load '.$load.' for '.$process.' tasks ('.$maxsysload.') too high.');
                                return true;
                        }
                }
@@ -1425,7 +1512,7 @@ function run_update_function($x) {
 function check_plugins(&$a) {
 
        $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-       if(count($r))
+       if(dbm::is_result($r))
                $installed = $r;
        else
                $installed = array();
@@ -1756,7 +1843,7 @@ function current_theme(){
                $r = q("select theme from user where uid = %d limit 1",
                        intval($a->profile_uid)
                );
-               if($r)
+               if(dbm::is_result($r))
                        $page_theme = $r[0]['theme'];
        }
 
@@ -1869,7 +1956,7 @@ function feed_birthday($uid,$tz) {
                        intval($uid)
        );
 
-       if($p && count($p)) {
+       if(dbm::is_result($p)) {
                $tmp_dob = substr($p[0]['dob'],5);
                if(intval($tmp_dob)) {
                        $y = datetime_convert($tz,$tz,'now','Y');