Changeset 40094 for trunk/ippMonitor

Timestamp:

Jul 11, 2017, 3:44:01 PM (9 years ago)

Author:

eugene

Message:

sort order for labels in list by priority DESC, label

Location:

trunk/ippMonitor

Files:

• czartool/czartool/CzarDb.pm (modified) (1 diff)
• raw/czartool_labels.php (modified) (2 diffs)

trunk/ippMonitor/czartool/czartool/CzarDb.pm

@@ -91 +91 @@
     SELECT label
         FROM current_labels
-        WHERE server LIKE '$server';
+        WHERE server LIKE '$server'
+        ORDER BY priority DESC, label;
 SQL
 

trunk/ippMonitor/raw/czartool_labels.php

@@ -395 +395 @@
 
     # order by descending priority as set in project database
-    $sql = "SELECT label FROM current_labels WHERE server LIKE '$server' ORDER BY priority DESC";
+    $sql = "SELECT label FROM current_labels WHERE server LIKE '$server' ORDER BY priority DESC, label";
     if ($debug) {echo "$sql<br>";}
 
@@ -949 +949 @@
 
     }
+
+    # note: mysql user must have either SUPER or REPLICATION CLIENT privileges on the database 
     $res = $dbRepl->query('SHOW SLAVE STATUS');
+    if (dberror($res)) {
+        echo "<tr><td>$replDatabaseName</td><td bgcolor=\"red\">MySQL query error - invalid user? check configuration</td></tr>";
+        //die("MySQL DB connection error: Check the configuration for $replDatabaseName");
+        //die("");
+        return -1;
+    }
+
     while ($res->fetchInto($row)) {
         # Have a look for Last_Errno in http://dev.mysql.com/doc/refman/5.0/en/show-slave-status.html