From 5130c33712fb3e500e1cf06eface3ac6e21102ff Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 1 Oct 2014 20:08:17 +0200 Subject: changed iso timeformat Z vs T --- src/daq/flumotion-plug/sfive.py | 2 +- src/daq/flumotion-rrd/flumotion-rrd.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/daq/flumotion-plug/sfive.py b/src/daq/flumotion-plug/sfive.py index 2b00b80..5e48164 100644 --- a/src/daq/flumotion-plug/sfive.py +++ b/src/daq/flumotion-plug/sfive.py @@ -149,7 +149,7 @@ class ComponentSFivePlug(base.ComponentPlug): bytes_sent_diff = bytes_sent - self._old_bytes_sent if self._old_bytes_sent > 0 else 0; self._old_bytes_sent = bytes_sent - data = { "start-time": datetime.datetime.utcnow().isoformat('Z'), + data = { "start-time": datetime.datetime.utcnow().isoformat('T'), "duration-ms": self._duration * 1000, "data": { "client-count": client_count, diff --git a/src/daq/flumotion-rrd/flumotion-rrd.py b/src/daq/flumotion-rrd/flumotion-rrd.py index 405b335..59ba6f6 100755 --- a/src/daq/flumotion-rrd/flumotion-rrd.py +++ b/src/daq/flumotion-rrd/flumotion-rrd.py @@ -124,7 +124,7 @@ class FlumotionRRD(): reactor.stop() print 'SFive: will use 7 days of data ending with %s using a step size of %d seconds' % ( - datetime.datetime.utcfromtimestamp(self._end).isoformat('Z'), self._duration) + datetime.datetime.utcfromtimestamp(self._end).isoformat('T'), self._duration) def _sendInit(self): initdata = { "hostname": self._hostname, @@ -154,7 +154,7 @@ class FlumotionRRD(): return max def _sendDataset(self, timestamp, duration, client_count, bytes_sent): - data = { "start-time": timestamp.isoformat('Z'), + data = { "start-time": timestamp.isoformat('T'), "duration-ms": duration * 1000, "data": { "client-count": client_count, -- cgit v1.2.3