Increased database version

diff --git a/boot.php b/boot.php
index 59011bc64f9aff2c0e171bf951d9ae5e7940ca50..b1f956fb2bf1c0ad22660c4074022ebf6e79d6e0 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -41,7 +41,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.2-rc' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1227      );
+define ( 'DB_UPDATE_VERSION',      1228      );
 
 /**
  * @brief Constant with a HTML line break.

diff --git a/database.sql b/database.sql
index 4a5946ef38dc747b8c210e7f4f5b84ea60e046a4..2c1326491965272d9b755e0b847f1d7845c4b995 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -580,7 +580,7 @@ CREATE TABLE IF NOT EXISTS `locks` (
        `id` int(11) NOT NULL auto_increment,
        `name` varchar(128) NOT NULL DEFAULT '',
        `locked` tinyint(1) NOT NULL DEFAULT 0,
-       `created` datetime DEFAULT '0001-01-01 00:00:00',
+       `pid` int(10) unsigned NOT NULL DEFAULT 0,
         PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 

diff --git a/include/poller.php b/include/poller.php
index 68c5acbcbe227604ed4e1e0dd52adf8e2604b08c..b08d98ca75b225fc46eb66ffd97c7159d81fa9e1 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -461,8 +461,7 @@ function poller_too_much_workers() {
                        dba::close($processes);
                }
                dba::close($entries);
-
-               $processlist = implode(', ', $listitem);
+               $processlist = ' ('.implode(', ', $listitem).')';
 
                $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= '%s'", dbesc(NULL_DATE));
                $entries = $s[0]["total"];
@@ -481,7 +480,7 @@ function poller_too_much_workers() {
                        }
                }
 
-               logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries." (".$processlist.") - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
+               logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries.$processlist." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
 
                // Are there fewer workers running as possible? Then fork a new one.
                if (!Config::get("system", "worker_dont_fork") AND ($queues > ($active + 1)) AND ($entries > 1)) {

diff --git a/update.php b/update.php
index 7561a9af19546e0d388dd2750da1683fb22f088b..76620a48a4629eb4b26ac5169798714bac0064b1 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1227);
+define('UPDATE_VERSION' , 1228);
 
 /**
  *