Changeset 1259 for trunk/wifidog-auth/wifidog/node_list.php

Timestamp:

07/17/07 00:24:33 (6 years ago)

Author:

benoitg

Message:

• Use last_heartbeat_sys_uptime untill #354 is fixed

Files:

• trunk/wifidog-auth/wifidog/node_list.php (modified) (2 diffs)

trunk/wifidog-auth/wifidog/node_list.php

@@ -98 +98 @@
         $sort_by_param_sql = $sort_by_param;
     }
-    $sql = "SELECT node_id, gw_id, name, last_heartbeat_user_agent, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS online, creation_date, node_deployment_status, last_heartbeat_wifidog_uptime FROM nodes WHERE node_deployment_status != 'PERMANENTLY_CLOSED' ORDER BY {$sort_by_param_sql}";
+    $sql = "SELECT node_id, gw_id, name, last_heartbeat_user_agent, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS online, creation_date, node_deployment_status, last_heartbeat_wifidog_uptime, last_heartbeat_sys_uptime FROM nodes WHERE node_deployment_status != 'PERMANENTLY_CLOSED' ORDER BY {$sort_by_param_sql}";
 }
 else {
-    $sql = "SELECT node_id, gw_id, name, last_heartbeat_user_agent, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS online, creation_date, node_deployment_status, last_heartbeat_wifidog_uptime FROM nodes WHERE node_deployment_status != 'PERMANENTLY_CLOSED' ORDER BY " . DEFAULT_SORT_BY_PARAM;
+    $sql = "SELECT node_id, gw_id, name, last_heartbeat_user_agent, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS online, creation_date, node_deployment_status, last_heartbeat_wifidog_uptime, last_heartbeat_sys_uptime FROM nodes WHERE node_deployment_status != 'PERMANENTLY_CLOSED' ORDER BY " . DEFAULT_SORT_BY_PARAM;
 }
 $nodes_results = null;
@@ -117 +117 @@
     $node = Node :: getObject($node_row['node_id']);
     $node_row['duration'] = $db->GetDurationArrayFromIntervalStr($node_row['since_last_heartbeat']);
-    if($node_row['last_heartbeat_wifidog_uptime']) {
-        $previousRemainder = $node_row['last_heartbeat_wifidog_uptime'];
+    if($node_row['last_heartbeat_sys_uptime']) {
+        $previousRemainder = $node_row['last_heartbeat_sys_uptime'];
         $remainder = $previousRemainder % (3600*24);
         $node_row['wifidog_uptime']['days'] = ($previousRemainder - $remainder)  / (3600*24);