diff options
| author | Ben Brown <ben.brown@codethink.co.uk> | 2020-07-17 09:14:57 +0000 |
|---|---|---|
| committer | Ben Brown <ben.brown@codethink.co.uk> | 2020-07-17 09:14:57 +0000 |
| commit | 1893e9a00893c083b7282dae31882e2aae39816d (patch) | |
| tree | d962426085500edf5f97c0050ab6eeff3cbb0e82 | |
| parent | c93409d4493f1374d626f21f9f68def3a88f09a6 (diff) | |
| parent | 16edf0a9cd3a7ee230135f8ed301fc9e8c3c6f2c (diff) | |
| download | lorry-controller-1893e9a00893c083b7282dae31882e2aae39816d.tar.gz | |
Merge branch 'bwh/sensible-disk-space' into 'master'
Improve disk space formatting
Closes #14
See merge request CodethinkLabs/lorry/lorry-controller!18
| -rw-r--r-- | lorrycontroller/status.py | 8 | ||||
| -rw-r--r-- | templates/status.tpl | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lorrycontroller/status.py b/lorrycontroller/status.py index 8fbc1b7..8483485 100644 --- a/lorrycontroller/status.py +++ b/lorrycontroller/status.py @@ -103,8 +103,8 @@ class StatusRenderer(object): free_bytes = result.f_bavail * result.f_bsize return { 'disk_free': free_bytes, - 'disk_free_mib': free_bytes / 1024**2, - 'disk_free_gib': free_bytes / 1024**3, + 'disk_free_mib': free_bytes // 1024**2, + 'disk_free_gib': free_bytes // 1024**3, } def get_run_queue(self, statedb): @@ -130,9 +130,9 @@ class StatusRenderer(object): result = [] - hours = secs / 3600 + hours = secs // 3600 secs %= 3600 - mins = secs / 60 + mins = secs // 60 secs %= 60 if hours > 0: diff --git a/templates/status.tpl b/templates/status.tpl index 277b4b8..ff572de 100644 --- a/templates/status.tpl +++ b/templates/status.tpl @@ -46,7 +46,13 @@ <p>Maximum number of jobs: {{max_jobs}}.</p> - <p>Free disk space: {{disk_free_gib}} GiB.</p> + <p>Free disk space: +% if disk_free_gib: + {{disk_free_gib}} GiB. +% else: + {{disk_free_mib}} MiB. +% end + </p> <h2>Upstream Hosts</h2> |