Author: croberts
Date: 2011-06-03 12:07:54 +0000 (Fri, 03 Jun 2011)
New Revision: 4801
Modified:
trunk/cumin/model/rosemary.xml
trunk/cumin/python/cumin/objectselector.py
trunk/rosemary/python/rosemary/util.py
Log:
Taking care of BZ
https://bugzilla.redhat.com/show_bug.cgi?id=710283 by removing seconds
from the uptime display and adding a key to the label.
Modified: trunk/cumin/model/rosemary.xml
===================================================================
--- trunk/cumin/model/rosemary.xml 2011-06-02 16:24:51 UTC (rev 4800)
+++ trunk/cumin/model/rosemary.xml 2011-06-03 12:07:54 UTC (rev 4801)
@@ -307,7 +307,7 @@
</statistic>
<statistic name="MonitorSelfAge">
- <title>Up-time</title>
+ <title>Up-time (dd:hh:mm)</title>
<formatter>fmt_timestamp_ddhhmmss</formatter>
</statistic>
@@ -444,7 +444,7 @@
</statistic>
<statistic name="MonitorSelfAge">
- <title>Up-time</title>
+ <title>Up-time (dd:hh:mm)</title>
<formatter>fmt_timestamp_ddhhmmss</formatter>
</statistic>
</class>
@@ -537,7 +537,7 @@
</statistic>
<statistic name="MonitorSelfAge">
- <title>Up-time</title>
+ <title>Up-time (dd:hh:mm)</title>
<formatter>fmt_timestamp_ddhhmmss</formatter>
</statistic>
</class>
Modified: trunk/cumin/python/cumin/objectselector.py
===================================================================
--- trunk/cumin/python/cumin/objectselector.py 2011-06-02 16:24:51 UTC (rev 4800)
+++ trunk/cumin/python/cumin/objectselector.py 2011-06-03 12:07:54 UTC (rev 4801)
@@ -571,8 +571,7 @@
days = value / 86400
hours = (value / 3600) - (days * 24)
minutes = (value / 60) - (days * 1440) - (hours * 60)
- seconds = value % 60
- return '%02d:%02d:%02d:%02d' % (days, hours, minutes, seconds)
+ return '%02d:%02d:%02d' % (days, hours, minutes)
class ExportButton(Widget):
def __init__(self, app, name, args, exporter, file_name):
Modified: trunk/rosemary/python/rosemary/util.py
===================================================================
--- trunk/rosemary/python/rosemary/util.py 2011-06-02 16:24:51 UTC (rev 4800)
+++ trunk/rosemary/python/rosemary/util.py 2011-06-03 12:07:54 UTC (rev 4801)
@@ -20,5 +20,4 @@
days = value / 86400
hours = (value / 3600) - (days * 24)
minutes = (value / 60) - (days * 1440) - (hours * 60)
- seconds = value % 60
- return '%02d:%02d:%02d:%02d' % (days, hours, minutes, seconds)
\ No newline at end of file
+ return '%02d:%02d:%02d' % (days, hours, minutes)
\ No newline at end of file