diff options
| author | Martin Poirier <theeth@yahoo.com> | 2012-01-30 05:17:06 +0400 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2012-01-30 05:17:06 +0400 |
| commit | 8b56ce969db281579bf35000ef7b20a8d9590dbb (patch) | |
| tree | e830df98ba261b4d4133036a653310a10c0afcfc /netrender/master_html.py | |
| parent | 88085b624c2c128710051e3ffc70dc3ab9d53acc (diff) | |
netrender (features coded by Philippe van Hecke)
Support for secure connections between Master/client/slave using SSL/HTTPS
Fixed a bug with total job time on web interface (wrong value)
Diffstat (limited to 'netrender/master_html.py')
| -rw-r--r-- | netrender/master_html.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/netrender/master_html.py b/netrender/master_html.py index e5ff108d..39c7f811 100644 --- a/netrender/master_html.py +++ b/netrender/master_html.py @@ -142,7 +142,8 @@ def get(handler): tot_cache, tot_fluid, tot_other = countFiles(job) serializedJob["totcache"] = tot_cache serializedJob["totfluid"] = tot_fluid - serializedJob["totother"] = tot_other + serializedJob["totother"] = tot_other + serializedJob["wktime"] = (time.time()-job.start_time ) if job.status != JOB_FINISHED else (job.finish_time-job.start_time) else: serializedJob={"name":"invalid job"} |