diff --git a/src/monitor.py b/src/monitor.py index 8610385..d391347 100755 --- a/src/monitor.py +++ b/src/monitor.py @@ -217,6 +217,7 @@ class Container_Collector(threading.Thread): else: basic_info['RunningTime'] = 0 basic_info['billing'] = 0 + basic_info['billing_this_hour'] = 0 for part in parts: if not part == '': key_val = re.split(':',part) @@ -228,7 +229,6 @@ class Container_Collector(threading.Thread): #if basic_exist: # logger.info(workercinfo[container_name]['basic_info']) if(info['State'] == 'STOPPED'): - basic_info['billing_this_hour'] = 0 workercinfo[container_name]['basic_info'] = basic_info #logger.info(basic_info) return False diff --git a/web/templates/monitor/status.html b/web/templates/monitor/status.html index 9146db9..09de23e 100644 --- a/web/templates/monitor/status.html +++ b/web/templates/monitor/status.html @@ -87,7 +87,7 @@ Mem Usage Disk Usage Total Billing - Billing This Hour + Billing This Running Hour Summary diff --git a/web/templates/monitor/statusRealtime.html b/web/templates/monitor/statusRealtime.html index e134a45..0c60545 100644 --- a/web/templates/monitor/statusRealtime.html +++ b/web/templates/monitor/statusRealtime.html @@ -46,7 +46,7 @@ Mem Usage Disk Usage Total Billing - Billing This Hour + Billing This Running Hour