From b2099510946d5980cc48a3c33c63cd1980619b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Fri, 27 Feb 2015 16:42:56 +0100
Subject: [PATCH] * Server and client now return at least one item dict (so
it's bool distinguishable from Error) * Fixed initialization logging
---
warden3/warden_client/warden_client.py | 2 +-
warden3/warden_server/warden_server.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/warden3/warden_client/warden_client.py b/warden3/warden_client/warden_client.py
index f1a9b21..ff84dcd 100644
--- a/warden3/warden_client/warden_client.py
+++ b/warden3/warden_client/warden_client.py
@@ -540,7 +540,7 @@ class Client(object):
ev = next_ev
idx_xlat = next_idx_xlat
- return self.log_err(err) if err.errors else {}
+ return self.log_err(err) if err.errors else {"saved": len(events)}
def getEvents(self, id=None, idstore=None, count=None,
diff --git a/warden3/warden_server/warden_server.py b/warden3/warden_server/warden_server.py
index 2949a14..0f749d1 100755
--- a/warden3/warden_server/warden_server.py
+++ b/warden3/warden_server/warden_server.py
@@ -191,7 +191,7 @@ def FileLogger(req, filename, level=logging.INFO):
logger = get_clean_root_logger(level)
logger.addFilter(ffilt)
logger.addHandler(fhand)
- logging.info("Initialized FileLogger(req=%s, filename=\"%s\", \"%s\")" % (type(req).__name__, filename, level))
+ logging.info("Initialized FileLogger(req=%s, filename=\"%s\", level=\"%d\")" % (type(req).__name__, filename, level))
@@ -204,7 +204,7 @@ def SysLogger(req, socket="/dev/log", facility=logging.handlers.SysLogHandler.LO
logger = get_clean_root_logger(level)
logger.addFilter(ffilt)
logger.addHandler(fhand)
- logging.info("Initialized SysLogger(req=%s, socket=\"%s\", facility=\"%s\", level=\"%s\")" % (type(req).__name__, socket, facility, level))
+ logging.info("Initialized SysLogger(req=%s, socket=\"%s\", facility=\"%d\", level=\"%d\")" % (type(req).__name__, socket, facility, level))
@@ -957,7 +957,7 @@ class WardenHandler(ObjectReq):
if errs:
raise self.req.error(errors=errs)
- return {}
+ return {"saved": saved}
--
GitLab