Commit d393d547 authored by Mike Hibler's avatar Mike Hibler

Fix a couple of more incorrect timestamp conversions

parent bfecdbeb
......@@ -150,7 +150,8 @@ print "\n=== plabmetrics ".
#
my $query_result =
DBQueryFatal("select n.node_id as plabnode, nr.*, ".
" now() - nr.status_timestamp as metricsage ".
" unix_timestamp()-unix_timestamp(nr.status_timestamp) ".
" as metricsage ".
" from nodes as n ".
"left join node_types as nt on n.type=nt.type ".
"left join node_rusage as nr on nr.node_id=n.node_id ".
......
......@@ -184,7 +184,8 @@ if ($showstate) {
my $query_result =
DBQueryFatal("select n.node_id as plabnode, ni.hostname, i.IP, ".
" nr.load_1min,nr.load_5min,nr.load_15min,nr.disk_used, ".
" now() - nr.status_timestamp as metricsage ".
" unix_timestamp()-unix_timestamp(nr.status_timestamp) ".
" as metricsage ".
" from nodes as n ".
"left join node_types as nt on n.type=nt.type ".
"left join widearea_nodeinfo as ni on n.node_id=ni.node_id ".
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment