Separate config options to display the worker jobs per minute

[friendica.git] / src / Core / Worker.php

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 00b22c78858c0b06c34ca643174b251fca5a5240..cd1627244337d99a8d2594b93139447aea2d9964 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -657,6 +657,19 @@ class Worker
 
                        $processlist = '';
 
+                       if (Config::get('system', 'worker_jpm')) {
+                               $intervals = [1, 10, 60];
+                               $jobs_per_minute = [];
+                               foreach ($intervals as $interval) {
+                                       $jobs = DBA::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL ".intval($interval)." MINUTE");
+                                       if ($job = DBA::fetch($jobs)) {
+                                               $jobs_per_minute[$interval] = number_format($job['jobs'] / $interval, 0);
+                                       }
+                                       DBA::close($jobs);
+                               }
+                               $processlist = ' - jpm: '.implode('/', $jobs_per_minute);
+                       }
+
                        if (Config::get('system', 'worker_debug')) {
                                // Create a list of queue entries grouped by their priority
                                $listitem = [];
@@ -686,16 +699,7 @@ class Worker
                                }
                                DBA::close($entries);
 
-                               $intervals = [1, 10, 60];
-                               $jobs_per_minute = [];
-                               foreach ($intervals as $interval) {
-                                       $jobs = DBA::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL ".intval($interval)." MINUTE");
-                                       if ($job = DBA::fetch($jobs)) {
-                                               $jobs_per_minute[$interval] = number_format($job['jobs'] / $interval, 0);
-                                       }
-                                       DBA::close($jobs);
-                               }
-                               $processlist = ' - jpm: '.implode('/', $jobs_per_minute).' ('.implode(', ', $listitem).')';
+                               $processlist .= ' ('.implode(', ', $listitem).')';
                        }
 
                        $entries = self::totalEntries();