From: Michael <heluecht@pirati.ca>
Date: Tue, 6 Jun 2017 12:07:27 +0000 (+0000)
Subject: Increased database version
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8d13751d40d40d1d348584ae5ff803096e09f3af;p=friendica.git

Increased database version
---

diff --git a/boot.php b/boot.php
index 59011bc64f..b1f956fb2b 100644
--- 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 4a5946ef38..2c13264919 100644
--- 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 68c5acbcbe..b08d98ca75 100644
--- 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 7561a9af19..76620a48a4 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1227);
+define('UPDATE_VERSION' , 1228);
 
 /**
  *