Add additional checks for the worker

diff --git a/boot.php b/boot.php
index 419a634fa2ec119200904e2963e91048330f20f4..ba692405a60404324dd3bd5409706b770e72c432 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1086,6 +1086,11 @@ function proc_run($cmd) {
        $parameters = json_encode($argv);
        $found = dba::exists('workerqueue', array('parameter' => $parameters, 'done' => false));
 
+       // Quit if there was a database error - a precaution for the update process to 3.5.3
+       if (dba::errorNo() != 0) {
+               return;
+       }
+
        if (!$found) {
                dba::insert('workerqueue', array('parameter' => $parameters, 'created' => $created, 'priority' => $priority));
        }

diff --git a/doc/htconfig.md b/doc/htconfig.md
index d3d4dad6ef7f276fd98ad8c159c0e7cc0efc7a85..cbb76a38c38b9758e167dd4dd74a81609af34042 100644 (file)
--- a/doc/htconfig.md
+++ b/doc/htconfig.md
@@ -47,6 +47,7 @@ Example: To set the directory value please add this line to your .htconfig.php:
 * **frontend_worker_timeout** - Value in minutes after we think that a frontend task was killed by the webserver. Default value is 10.
 * **hsts** (Boolean) - Enables the sending of HTTP Strict Transport Security headers
 * **ignore_cache** (Boolean) - For development only. Disables the item cache.
+* **ipv4_resolve** (Boolean) - Resolve IPV4 addresses only. Don't resolve to IPV6. Default value is false.
 * **like_no_comment** (Boolean) - Don't update the "commented" value of an item when it is liked.
 * **local_block** (Boolean) - Used in conjunction with "block_public".
 * **local_search** (Boolean) - Blocks search for users who are not logged in to prevent crawlers from blocking your system.

diff --git a/include/dba.php b/include/dba.php
index bc3802935163badf83d5c4eea5ef8c8b979b3319..a10f18aba794e51a6544480692c319d79c1f9f42 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -1259,6 +1259,24 @@ class dba {
                return $data;
        }
 
+       /**
+        * @brief Returns the error number of the last query
+        *
+        * @return string Error number (0 if no error)
+        */
+       public static function errorNo() {
+               return self::$dbo->errorno;
+       }
+
+       /**
+        * @brief Returns the error message of the last query
+        *
+        * @return string Error message ('' if no error)
+        */
+       public static function errorMessage() {
+               return self::$dbo->error;
+       }
+
        /**
         * @brief Closes the current statement
         *

diff --git a/include/poller.php b/include/poller.php
index aa8763af339363f13a6302bffb59064135e081e5..312347d71a6f9ea73377276b2963221eabf0ce21 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -248,7 +248,9 @@ function poller_execute($queue) {
                poller_exec_function($queue, $funcname, $argv);
 
                $stamp = (float)microtime(true);
-               dba::update('workerqueue', array('done' => true), array('id' => $queue["id"]));
+               if (dba::update('workerqueue', array('done' => true), array('id' => $queue["id"]))) {
+                       Config::set('system', 'last_poller_execution', datetime_convert());
+               }
                $poller_db_duration = (microtime(true) - $stamp);
        } else {
                logger("Function ".$funcname." does not exist");

diff --git a/mod/admin.php b/mod/admin.php
index 49596578b8f4e1b0b45bc2ebc737e891cfbf663e..2fb2fea8307c9139d98dc06c3ac80aa108697982 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -626,6 +626,15 @@ function admin_page_summary(App $a) {
                $warningtext[] = t('The database update failed. Please run "php include/dbstructure.php update" from the command line and have a look at the errors that might appear.');
        }
 
+       $last_worker_call = Config::get('system', 'last_poller_execution', false);
+       if (!$last_worker_call) {
+               $showwarning = true;
+               $warningtext[] = t('The worker was never executed. Please check your database structure!');
+       } elseif ((strtotime(datetime_convert()) - strtotime($last_worker_call)) > 60 * 60) {
+               $showwarning = true;
+               $warningtext[] = sprintf(t('The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings.'), $last_worker_call);
+       }
+
        $r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`");
        $accounts = array(
                array(t('Normal Account'), 0),