From 17a4873ae3f072a06d3cdf854318f2ee6e99b111 Mon Sep 17 00:00:00 2001 From: Eric Price Date: Tue, 9 Oct 2007 23:21:39 -0400 Subject: [PATCH] don't display uptime, cputime when machine is off. svn path=/trunk/web/; revision=167 --- templates/main.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/templates/main.py b/templates/main.py index 1567acc..b809430 100755 --- a/templates/main.py +++ b/templates/main.py @@ -699,12 +699,14 @@ def info(user, fields): if status is None: main_status = dict(name=machine.name, memory=str(machine.memory)) + uptime=None + cputime=None else: main_status = dict(status[1:]) - start_time = float(main_status.get('start_time', 0)) - uptime = datetime.timedelta(seconds=int(time.time()-start_time)) - cpu_time_float = float(main_status.get('cpu_time', 0)) - cputime = datetime.timedelta(seconds=int(cpu_time_float)) + start_time = float(main_status.get('start_time', 0)) + uptime = datetime.timedelta(seconds=int(time.time()-start_time)) + cpu_time_float = float(main_status.get('cpu_time', 0)) + cputime = datetime.timedelta(seconds=int(cpu_time_float)) display_fields = """name uptime memory state cpu_weight on_reboot on_poweroff on_crash on_xend_start on_xend_stop bootloader""".split() display_fields = [('name', 'Name'), @@ -742,7 +744,7 @@ def info(user, fields): main_status['memory'] += ' MB' for field, disp in display_fields: - if field in ('uptime', 'cputime'): + if field in ('uptime', 'cputime') and locals()[field] is not None: fields.append((disp, locals()[field])) elif field in machine_info: fields.append((disp, machine_info[field])) -- 1.7.9.5