Skip to content

Commit c3d1804

Browse files
author
Till Brehm
committed
Merge branch '6671-pending-queue-query-does-not-take-active-state-of-servers-into-account' into 'develop'
Resolve "Pending queue query does not take active state of servers into account" Closes #6671 See merge request ispconfig/ispconfig3!1868
2 parents 2c15257 + c755876 commit c3d1804

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

interface/lib/classes/db_mysql.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ public function datalogStatus($login = '') {
847847

848848
$result = $this->queryAllRecords("SELECT COUNT( * ) AS cnt, sys_datalog.action, sys_datalog.dbtable
849849
FROM sys_datalog, server
850-
WHERE (server.server_id = sys_datalog.server_id or sys_datalog.server_id = 0) AND sys_datalog.user = ? AND sys_datalog.datalog_id > server.updated
850+
WHERE (server.server_id = sys_datalog.server_id or sys_datalog.server_id = 0) AND sys_datalog.user = ? AND sys_datalog.datalog_id > server.updated AND server.active = 1
851851
GROUP BY sys_datalog.dbtable, sys_datalog.action",
852852
$login);
853853
foreach($result as $row) {

0 commit comments

Comments
 (0)