diff options
| author | nicolargo <nicolas@nicolargo.com> | 2019-10-12 11:22:07 +0200 |
|---|---|---|
| committer | nicolargo <nicolas@nicolargo.com> | 2019-10-12 11:22:07 +0200 |
| commit | 16a9ce3ad1b0faf91bf791397743e0eac4b38389 (patch) | |
| tree | 774e4570cd5f8259b8cfccdd2bb34618e1d5aa68 | |
| parent | 1f8e6efe8ca2be5d9cb9be3d1a4e18b659157c2d (diff) | |
| parent | 26e6a75b6602bb1ea1aa2e3c4346529139f84377 (diff) | |
Merge branch 'develop' of https://github.com/nicolargo/glances into develop
| -rw-r--r-- | glances/main.py | 3 | ||||
| -rw-r--r-- | glances/outputs/glances_bottle.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/glances/main.py b/glances/main.py index 53ca7782..0b5f070b 100644 --- a/glances/main.py +++ b/glances/main.py @@ -309,9 +309,8 @@ Examples of use: if WINDOWS: args.webserver = True - # In web server mode, default refresh time: 5 sec + # In web server mode if args.webserver: - args.time = 5 args.process_short_name = True # Server or client login/password diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py index 8bd8991c..0b480276 100644 --- a/glances/outputs/glances_bottle.py +++ b/glances/outputs/glances_bottle.py @@ -225,7 +225,7 @@ class GlancesBottle(object): """Bottle callback for index.html (/) file.""" if refresh_time is None or refresh_time < 1: - refresh_time = self.args.time + refresh_time = int(self.args.time) # Update the stat self.__update__() |