From e4594829f34e562efbe824d67e4a6e5b27dd8b33 Mon Sep 17 00:00:00 2001 From: Bartlomiej Cieszkowski Date: Mon, 17 Feb 2020 07:49:00 +0100 Subject: tz --- glances/plugins/glances_now.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/glances/plugins/glances_now.py b/glances/plugins/glances_now.py index 85f4ece1..497af195 100644 --- a/glances/plugins/glances_now.py +++ b/glances/plugins/glances_now.py @@ -19,7 +19,7 @@ """Now (current date) plugin.""" -from time import tzname, localtime +from time import tzname, localtime, strftime from datetime import datetime from glances.plugins.glances_plugin import GlancesPlugin @@ -48,12 +48,10 @@ class Plugin(GlancesPlugin): def update(self): """Update current date/time.""" # Had to convert it to string because datetime is not JSON serializable - self.stats = datetime.now().strftime('%Y-%m-%d %H:%M:%S') - # Add the time zone (issue #1249 and issue #1337) - if 'tmzone' in localtime(): - self.stats += ' {}'.format(localtime().tm_zone) - elif len(tzname) > 0: - self.stats += ' {}'.format(tzname[1]) + if (len(tzname[1]) > 6): + self.stats = strftime('%Y-%m-%d %H:%M:%S %z') + else: + self.stats = strftime('%Y-%m-%d %H:%M:%S %Z') return self.stats -- cgit v1.2.3 From f9c13723c8968d38839c597d4367c87b6082736d Mon Sep 17 00:00:00 2001 From: Bartlomiej Cieszkowski Date: Mon, 17 Feb 2020 07:52:20 +0100 Subject: unused import --- glances/plugins/glances_now.py | 1 - 1 file changed, 1 deletion(-) diff --git a/glances/plugins/glances_now.py b/glances/plugins/glances_now.py index 497af195..b1a3fc82 100644 --- a/glances/plugins/glances_now.py +++ b/glances/plugins/glances_now.py @@ -20,7 +20,6 @@ """Now (current date) plugin.""" from time import tzname, localtime, strftime -from datetime import datetime from glances.plugins.glances_plugin import GlancesPlugin -- cgit v1.2.3 From a7eb10598960ed15159d557b4f9d1c8d9ca2412c Mon Sep 17 00:00:00 2001 From: Bartlomiej Cieszkowski Date: Thu, 5 Mar 2020 23:00:40 +0100 Subject: dont remove comment --- glances/plugins/glances_now.py | 1 + 1 file changed, 1 insertion(+) diff --git a/glances/plugins/glances_now.py b/glances/plugins/glances_now.py index 59f62af8..254d71b8 100644 --- a/glances/plugins/glances_now.py +++ b/glances/plugins/glances_now.py @@ -48,6 +48,7 @@ class Plugin(GlancesPlugin): def update(self): """Update current date/time.""" # Had to convert it to string because datetime is not JSON serializable + # Add the time zone (issue #1249 / #1337 / #1598) if (len(tzname[1]) > 6): self.stats = strftime('%Y-%m-%d %H:%M:%S %z') else: -- cgit v1.2.3