From d5679493e6a144027948963153cddcd9ee67eeb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Tue, 3 Feb 2015 09:53:28 +0100
Subject: [PATCH] Turned sendEvents multiple errors into real Error, so client
does not have to special case
---
warden3/warden_client/warden_client_test.py | 1 +
warden3/warden_server/warden_server.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/warden3/warden_client/warden_client_test.py b/warden3/warden_client/warden_client_test.py
index 3eb85c4..74f39f0 100755
--- a/warden3/warden_client/warden_client_test.py
+++ b/warden3/warden_client/warden_client_test.py
@@ -82,6 +82,7 @@ def gen_random_idea(client_name="cz.example.warden.test"):
"Confidence": random(),
"Note": "Random event",
"ConnCount": randint(0, 65535),
+# "ConnCount": choice([randint(0, 65535), "asdf"]), # Send wrong event sometimes
"Source": [
{
"Type": ["Phishing"],
diff --git a/warden3/warden_server/warden_server.py b/warden3/warden_server/warden_server.py
index 07e7df1..ca7e4f4 100755
--- a/warden3/warden_server/warden_server.py
+++ b/warden3/warden_server/warden_server.py
@@ -854,10 +854,10 @@ class WardenHandler(ObjectReq):
logging.info("Saved %i events" % saved)
if errs:
- logging.info("Errors: \n%s\n" % str(errs))
-
- return errs
+ raise self.req.error("Errors saving some messages.", 422,
+ detail={"errors": errs})
+ return saved
def read_ini(path):
--
GitLab