From a220e53b2a06ff4e7b254facf4499a78435ae48a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Mon, 30 Mar 2015 16:58:05 +0200
Subject: [PATCH] Added format_timestamp helper function
---
warden3/warden_client/warden_client.py | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/warden3/warden_client/warden_client.py b/warden3/warden_client/warden_client.py
index e19b957..797e0eb 100644
--- a/warden3/warden_client/warden_client.py
+++ b/warden3/warden_client/warden_client.py
@@ -4,14 +4,13 @@
# Copyright (C) 2011-2015 Cesnet z.s.p.o
# Use of this source is governed by a 3-clause BSD-style license, see LICENSE file.
-import json, httplib, ssl, socket, logging, logging.handlers
+import json, httplib, ssl, socket, logging, logging.handlers, time
from urlparse import urlparse
from urllib import urlencode
from sys import stderr, exc_info
from pprint import pformat
from traceback import format_tb
from os import path
-from time import sleep
from operator import itemgetter
@@ -514,7 +513,7 @@ class Client(object):
while ev and attempt:
if attempt<retry:
self.logger.info("%d transient errors, retrying (%d to go)" % (len(ev), attempt))
- sleep(pause or self.pause)
+ time.sleep(pause or self.pause)
res = self.send_events_chunked(ev)
attempt -= 1
@@ -579,6 +578,16 @@ class Client(object):
+def format_timestamp(epoch=None, utcoffset=None):
+ t = epoch if epoch else time.time()
+ tstr = "%04d-%02d-%02dT%02d:%02d:%02d" % time.localtime(t)[:6]
+ us = int(t % 1 * 1000000 + 0.5)
+ usstr = "." + str(us).rstrip("0") if us else ""
+ offset = utcoffset if utcoffset is not None else -(time.altzone if time.daylight else time.timezone)
+ offsstr = ("%+03d:%02d" % divmod((offset+30)//60, 60)) if offset else "Z"
+ return tstr + usstr + offsstr
+
+
def read_cfg(cfgfile):
abspath = path.join(path.dirname(__file__), cfgfile)
with open(abspath, "r") as f:
--
GitLab