[checkmk-commits] Check_MK Git: check_mk: #1956 FIX WATO Web-API: Fixed exception information for single sites

Sven Rueß sr at mathias-kettner.de
Mon Apr 13 16:21:09 CEST 2015


Module: check_mk
Branch: master
Commit: ff1dd60be0c3ddfdf24fbb01ec27f9262edb9805
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff1dd60be0c3ddfdf24fbb01ec27f9262edb9805

Author: Sven Rueß <sr at mathias-kettner.de>
Date:   Mon Apr 13 16:20:13 2015 +0200

#1956 FIX WATO Web-API: Fixed exception information for single sites

Fixed exception information for single site if the action activate changes is used.

---

 .werks/1956        |   10 ++++++++++
 ChangeLog          |    1 +
 web/htdocs/wato.py |    2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.werks/1956 b/.werks/1956
new file mode 100644
index 0000000..eefc0e6
--- /dev/null
+++ b/.werks/1956
@@ -0,0 +1,10 @@
+Title: WATO Web-API: Fixed exception information for single sites
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1428934623
+
+Fixed exception information for single site if the action activate changes is used.
diff --git a/ChangeLog b/ChangeLog
index ae36f92..af1bbf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -434,6 +434,7 @@
     * 2158 FIX: Condition column in WATO rule tables has now a flexible width...
     * 2160 FIX: Fixed rename of hosts where a host with this name did exist before
     * 2191 FIX: Fixed handling of URL variable 'mode' in web API for discovering services...
+    * 1956 FIX: WATO Web-API: Fixed exception information for single sites...
 
     Notifications:
     * 1662 notification plugin spectrum: finalized script. now able to handle host notications
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index a631f72..ad2f0e3 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -18221,7 +18221,7 @@ class API:
                 try:
                     activate_changes()
                 except Exception, e:
-                    errors.append("%s: %s" % (site["id"], e))
+                    errors.append("Exception: %s" % e)
 
         if not errors:
             log_commit_pending()



More information about the checkmk-commits mailing list