Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

htmllib: Unified and improved element rendering and writing functionality.

by Roland Halbig

Module: check_mk Branch: master Commit: f5ef9b7d3d2ea4c3706faa4776ca886a1d25a01a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5ef9b7d3d2ea4… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 12:01:26 2016 +0100 htmllib: Unified and improved element rendering and writing functionality. htmllib: Minor cleanup. --- web/htdocs/htmllib.py | 82 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a88c9b6..5d8d568 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -370,6 +370,7 @@ class HTMLGenerator(OutputFunnel): self.indent_level = 0 self.indent = 2 + self.testing_mode = False # @@ -581,11 +582,6 @@ class HTMLGenerator(OutputFunnel): return HTML(tag) - # does not escape the script content - def _render_javascript(self, code): - return "<script language=\"javascript\">\n%s\n</script>\n" % code - - # Write functionlity # def write(self, text): # raise NotImplementedError() @@ -664,11 +660,11 @@ class HTMLGenerator(OutputFunnel): def render_a(self, content, href, **attrs): attrs['href'] = href - return HTML(self._render_content_tag('a', content, **attrs)) + return self._render_content_tag('a', content, **attrs) + def a(self, content, href, **attrs): - attrs['href'] = href - self.write(self._render_content_tag('a', content, **attrs)) + self.write(self.render_a(content, href, **attrs)) def stylesheet(self, href): @@ -680,23 +676,27 @@ class HTMLGenerator(OutputFunnel): # + # does not escape the script content + def render_javascript(self, code): + return HTML("<script language=\"javascript\">\n%s\n</script>\n" % code) + + def javascript(self, code): - self.write(self._render_javascript(code)) + self.write(self.render_javascript(code)) - def javascript_file(self, name): + def javascript_file(self, filename): """ <script type="text/javascript" src="js/%(name)s.js"/>\n """ - self.write(self._render_content_tag('script', '', type_="text/javascript", src='js/%s.js' % name)) + self.write(self._render_content_tag('script', '', type_="text/javascript", src='js/%s.js' % filename)) def render_img(self, src, **attrs): attrs['src'] = src - return HTML(self._render_opening_tag('img', close_tag=True, **attrs)) + return self._render_opening_tag('img', close_tag=True, **attrs) def img(self, src, **attrs): - attrs['src'] = src - self.write(self._render_opening_tag('img', close_tag=True, **attrs)) + self.write(self.render_img(src, **attrs)) def open_button(self, type_, **attrs): @@ -713,19 +713,27 @@ class HTMLGenerator(OutputFunnel): # - def label(self, content, for_, **attrs): + def render_label(self, content, for_, **attrs): attrs['for'] = for_ - self.write(self._render_content_tag('label', content, **attrs)) + return self._render_content_tag('label', content, **attrs) - def input(self, name, type_, **attrs): + def label(self, content, for_, **attrs): + self.write(self.render_label(content, for_, **attrs)) + + + def render_input(self, name, type_, **attrs): attrs['type_'] = type_ attrs['name'] = name - self.write(self._render_opening_tag('input', close_tag=True, **attrs)) + return self._render_opening_tag('input', close_tag=True, **attrs) + + + def input(self, name, type_, **attrs): + self.write(self.render_input(name, type_, **attrs)) # - # table elements + # table and list elements # @@ -734,11 +742,6 @@ class HTMLGenerator(OutputFunnel): self.write(self._render_content_tag('td', content, **attrs)) - # - # list elements - # - - def li(self, content, **attrs): """ Only for text content. You can't put HTML structure here. """ self.write(self._render_content_tag('li', content, **attrs)) @@ -749,23 +752,44 @@ class HTMLGenerator(OutputFunnel): # - def heading(self, content): + def render_heading(self, content): """ <h2>%(content)</h2> """ - self.write(self._render_content_tag('h2', content)) + return self._render_content_tag('h2', content) + + + def heading(self, content): + self.write(self.render_heading(content)) + + + def render_br(self): + return HTML("<br/>") def br(self): - self.write('<br/>') + self.write(self.render_br()) + + + def render_hr(self, **attrs): + return self._render_opening_tag('hr', close_tag=True, **attrs) def hr(self, **attrs): - self.write(self._render_opening_tag('hr', close_tag=True, **attrs)) + self.write(self.render_hr(**attrs)) def rule(self): self.hr() + def render_nbsp(self): + return HTML(" ") + + + def nbsp(self): + self.write(self.render_nbsp()) + + + #. # .--HTML Check_MK-------------------------------------------------------. # | _ _ _____ __ __ _ | @@ -1007,7 +1031,7 @@ class HTMLCheck_MK(HTMLGenerator): 'align' : 'absmiddle' if middle else None, 'src' : icon_name if "/" in icon_name else self.detect_icon_path(icon_name)} - return HTML(self._render_opening_tag('img', close_tag=True, **attributes)) + return self._render_opening_tag('img', close_tag=True, **attributes) def render_icon_button(self, url, help, icon, id=None, onclick=None,

7 years, 7 months

htmllib: Refactored text_input.

by Roland Halbig

Module: check_mk Branch: master Commit: cbf7b93bdd9869df1e7deda84bf1697c7d5dd574 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbf7b93bdd9869… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 12:05:14 2016 +0100 htmllib: Refactored text_input. --- web/htdocs/htmllib.py | 99 ++++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 5d8d568..e0295ca 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1777,67 +1777,70 @@ class html(DeprecationWrapper): "class=\"button%s\"%s value=\"%s\" />" % (varname, varname, self.attrencode(onclick), cssclass, style, text)) - def number_input(self, varname, deflt = "", size=8, style="", submit=None): - if deflt != None: - deflt = str(deflt) - self.text_input(varname, deflt, "number", size=size, style=style, submit=submit) + def text_input(self, varname, default_value = "", cssclass = "text", label = None, id_ = None, + submit = None, attrs = {}, **args): + # Model + error = self.user_errors.get(varname) + value = self.vars.get(varname, default_value) + if not value: + value = "" + if error: + self.set_focus(varname) + self.form_vars.append(varname) - def text_input(self, varname, default_value = "", cssclass = "text", label = None, id = None, - submit = None, attrs = {}, **args): - if default_value == None: - default_value = "" - addprops = "" - add_style = "" + # View + style, size = None, None if "size" in args and args["size"]: if args["size"] == "max": - add_style = "width: 100%; " + style = "width: 100%;" else: - addprops += " size=\"%d\"" % (args["size"] + 1) + size = "%d" % (args["size"] + 1) if not args.get('omit_css_width', False) and "width:" not in args.get("style", "") and not self.mobile: - add_style = "width: %d.8ex; " % args["size"] + style = "width: %d.8ex;" % args["size"] - if "type" in args: - mytype = args["type"] - else: - mytype = "text" - if "autocomplete" in args: - addprops += " autocomplete=\"%s\"" % args["autocomplete"] if args.get("style"): - addprops += " style=\"%s%s\"" % (add_style, args["style"]) - elif add_style: - addprops += " style=\"%s\"" % add_style - if args.get("read_only"): - addprops += " readonly" - - if submit != None: - if not id: - id = "ti_%s" % varname - self.final_javascript('document.getElementById("%s").onkeydown = ' - 'function(e) { if (!e) e = window.event; textinput_enter_submit(e, "%s"); };' - % (id, submit)) + style = [style, args["style"]] + + if (submit or label) and not id_: + id_ = "ti_%s" % varname + + onkeydown = None if not submit else\ + HTML('function(e) { if (!e) e = window.event; textinput_enter_submit(e, "%s"); };' % submit) + # TODO: REPLACE? +# if submit is not None: +# self.final_javascript('document.getElementById("%s").onkeydown = ' +# 'function(e) { if (!e) e = window.event; textinput_enter_submit(e, "%s"); };' +# % (id_, submit)) + + attributes = {"class" : cssclass, + "id" : id_, + "style" : style, + "size" : size, + "autocomplete" : args.get("autocomplete"), + "readonly" : "true" if args.get("read_only") else None, + "value" : value, + "onkeydown" : onkeydown, } + + for key, val in attrs.iteritems(): + if key not in attributes and key not in ["name", "type", "type_"]: + attributes[key] = val - value = self.vars.get(varname, default_value) - error = self.user_errors.get(varname) - html = "" if error: - html = "<x class=\"inputerror\">" - if label: - if not id: - id = "ti_%s" % varname - html += '<label for="%s">%s</label>' % (id, label) + self.open_x(class_="inputerror") - if id: - addprops += ' id="%s"' % id + if label: + self.label(label, for_=id_) + self.write(self.render_input(varname, type_=args.get("type", "text"), **attributes)) - attributes = ' ' + ' '.join([ '%s="%s"' % (k, self.attrencode(v)) for k, v in attrs.iteritems() ]) - html += "<input type=\"%s\" class=\"%s\" value=\"%s\" name=\"%s\"%s%s />\n" % \ - (mytype, cssclass, self.attrencode(value), varname, addprops, attributes) if error: - html += "</x>" - self.set_focus(varname) - self.write(html) - self.form_vars.append(varname) + self.close_x() + + + def number_input(self, varname, deflt = "", size=8, style="", submit=None): + if deflt != None: + deflt = str(deflt) + self.text_input(varname, deflt, "number", size=size, style=style, submit=submit) def password_input(self, varname, default_value = "", size=12, **args):

7 years, 7 months

htmllib: Refactored icon_select.

by Roland Halbig

Module: check_mk Branch: master Commit: ab34060461bbc87901891bfa99dfbfb618cc2d29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab34060461bbc8… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 12:07:49 2016 +0100 htmllib: Refactored icon_select. --- web/htdocs/htmllib.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 130f930..aba534d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1903,20 +1903,20 @@ class html(DeprecationWrapper): self.write(html_code) - def icon_select(self, varname, options, deflt=""): + def icon_select(self, varname, choices, deflt=""): + # Model current = self.var(varname, deflt) - self.write("<select class=icon name=\"%s\" id=\"%s\" size=\"1\">\n" % - (varname, varname)) - for value, text, icon in options: - if value == None: value = "" - sel = value == current and " selected" or "" - self.write('<option style="background-image:url(images/icon_%s.png);" ' - 'value=\"%s\"%s>%s</option>\n' % - (icon, self.attrencode(value), sel, self.attrencode(text))) - self.write("</select>\n") if varname: self.form_vars.append(varname) + # View + self.open_select(class_="icon", name=varname, id_=varname, size="1") + for value, text, icon in choices: + self.option(text, value=value if value else "", + selected="" if value == current else None, + style="background-image:url(images/icon_%s.png);" % icon) + self.close_select() + def begin_radio_group(self, horizontal=False): if self.mobile:

7 years, 7 months

htmllib: Refactored text_area.

by Roland Halbig

Module: check_mk Branch: master Commit: dae1d497d0b0369e78e85f0e8c81133016ebbdf2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dae1d497d0b036… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 12:06:22 2016 +0100 htmllib: Refactored text_area. --- web/htdocs/htmllib.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e0295ca..ba28612 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1848,21 +1848,29 @@ class html(DeprecationWrapper): def text_area(self, varname, deflt="", rows=4, cols=30, attrs = {}, try_max_width=False): + + # Model value = self.var(varname, deflt) error = self.user_errors.get(varname) + + self.form_vars.append(varname) if error: - self.write("<x class=inputerror>") + self.set_focus(varname) - attributes = ' ' + ' '.join([ '%s="%s"' % (k, v) for k, v in attrs.iteritems() ]) + # View style = "width: %d.8ex;" % cols if try_max_width: style += "width: calc(100%% - 10px); min-width: %d.8ex;" % cols - self.write("<textarea style=\"%s\" rows=%d cols=%d name=\"%s\"%s>%s</textarea>\n" % ( - style, rows, cols, varname, attributes, self.attrencode(value))) + attrs["style"] = style + attrs["rows"] = rows + attrs["cols"] = cols + attrs["name"] = varname + if error: - self.write("</x>") - self.set_focus(varname) - self.form_vars.append(varname) + self.open_x(class_="inputerror") + self.write(self._render_content_tag("textarea", value, **attrs)) + if error: + self.close_x() def sorted_select(self, varname, choices, deflt="", onchange=None, attrs = None):

7 years, 7 months

htmllib: Refactored select.

by Roland Halbig

Module: check_mk Branch: master Commit: 77710b974ae1c67a7491b4d11cea9b7529a42451 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77710b974ae1c6… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 12:07:05 2016 +0100 htmllib: Refactored select. --- web/htdocs/htmllib.py | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index ba28612..130f930 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1885,28 +1885,23 @@ class html(DeprecationWrapper): # Choices is a list pairs of (key, title). They keys of the choices # and the default value must be of type None, str or unicode. def select(self, varname, choices, deflt="", onchange=None, attrs = {}): + # Model current = self.get_unicode_input(varname, deflt) - onchange_code = onchange and " onchange=\"%s\"" % (onchange) or "" - attrs.setdefault('size', 1) - attributes = ' ' + ' '.join([ '%s="%s"' % (k, v) for k, v in attrs.iteritems() ]) - error = self.user_errors.get(varname) - if error: - self.write("<x class=\"inputerror\">") - self.write("<select%s name=\"%s\" id=\"%s\"%s>\n" % - (onchange_code, varname, varname, attributes)) - for value, text in choices: - if value == None: - value = "" - sel = value == current and " selected" or "" - self.write("<option value=\"%s\"%s>%s</option>\n" % - (self.attrencode(value), sel, self.attrencode(text))) - self.write("</select>\n") - if error: - self.write("<x class=\"inputerror\">") if varname: self.form_vars.append(varname) + # View + attrs.setdefault('size', 1) + html_code = HTML() + for value, text in choices: + html_code += self.render_option(text, value=value if value else "", + selected="" if value == current else None) + html_code = self.render_select(html_code, name=varname, id_=varname, onchange=onchange, **attrs) + if error: + html_code = self.render_x(html_code, class_="inputerror") + self.write(html_code) + def icon_select(self, varname, options, deflt=""): current = self.var(varname, deflt)

7 years, 7 months

4082 FIX Icon selector: Fixed exception in case non images are saved in icon folder

by Lars Michelsen

Module: check_mk Branch: master Commit: af0c1cd006264a761c5b1ba2411c8605ccfa3788 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af0c1cd006264a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 1 11:04:53 2016 +0100 4082 FIX Icon selector: Fixed exception in case non images are saved in icon folder --- .werks/4082 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 9 ++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/4082 b/.werks/4082 new file mode 100644 index 0000000..7b58c46 --- /dev/null +++ b/.werks/4082 @@ -0,0 +1,10 @@ +Title: Icon selector: Fixed exception in case non images are saved in icon folder +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480586351 + + diff --git a/ChangeLog b/ChangeLog index 8896401..0abbb95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 4076 FIX: Git integration: Using mail address of user in author info * 4077 FIX: Fixed "Request URI too long" when cloning role after editing another one * 4079 FIX: Improved error handling in case a WATO folder can not be written + * 4082 FIX: Icon selector: Fixed exception in case non images are saved in icon folder Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index b15b446..8c22978 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3931,7 +3931,14 @@ class IconSelector(ValueSpec): if file_name[-4:] == '.png' and os.path.isfile(file_path): # extract the category from the meta data - im = Image.open(file_path) + try: + im = Image.open(file_path) + except IOError, e: + if "%s" % e == "cannot identify image file": + continue # Silently skip invalid files + else: + raise + category = im.info.get('Comment') if category not in valid_categories: category = 'misc'

7 years, 7 months

4081 FIX dell_powerconnect_cpu: Fixed broken metrics

by Lars Michelsen

Module: check_mk Branch: master Commit: 82c92f1265c750706225d37a6999c8f3ab86ab3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82c92f1265c750… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 1 10:39:30 2016 +0100 4081 FIX dell_powerconnect_cpu: Fixed broken metrics --- .werks/4081 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4081 b/.werks/4081 new file mode 100644 index 0000000..c3c7843 --- /dev/null +++ b/.werks/4081 @@ -0,0 +1,10 @@ +Title: dell_powerconnect_cpu: Fixed broken metrics +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480585157 + + diff --git a/ChangeLog b/ChangeLog index 883888f..8896401 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * 4074 FIX: check_ftp: Fixed possible wrong service description caused by unintended use of global variable * 3943 FIX: ntp.time: fixed parameters in discovered checks... * 3994 FIX: windows agent: fixed memory and file handle leak when using windows eventlog... + * 4081 FIX: dell_powerconnect_cpu: Fixed broken metrics Multisite: * 4070 Added a painter for the service check period diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index aef51ac..be124f7 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4328,7 +4328,7 @@ check_metrics["check_mk-brocade_mlx.module_cpu"] = { "cpu_util200" : { "name" : "util5" }, } -check_metrics["check_mk-dell_powerconnect"] = { +check_metrics["check_mk-dell_powerconnect_cpu"] = { "load" : { "name" : "util" }, "loadavg 60s" : { "name" : "util1" }, "loadavg 5m" : { "name" : "util5" },

7 years, 7 months

4080 FIX Fixed possible exception "unsupported operand type" in matrix views

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e63d9c201af41ae6d1fccef4a0448e822648ff4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e63d9c201af41… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 1 10:32:14 2016 +0100 4080 FIX Fixed possible exception "unsupported operand type" in matrix views --- .werks/4080 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/4080 b/.werks/4080 new file mode 100644 index 0000000..1b328d8 --- /dev/null +++ b/.werks/4080 @@ -0,0 +1,10 @@ +Title: Fixed possible exception "unsupported operand type" in matrix views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480584652 + + diff --git a/ChangeLog b/ChangeLog index dbed8c1..883888f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * 3981 FIX: Views: Fixed context button displaying depending on usage * 4071 FIX: Removed notes_url from "LOG *" logwatch services... * 4072 FIX: Fixed multiple issues in BI availability when groups or names contain umlauts + * 4080 FIX: Fixed possible exception "unsupported operand type" in matrix views WATO: * 3984 Permissions can now be filtered by providing a search term on the "edit role" page... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 138257e..1215a52 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -731,6 +731,10 @@ class Cell(object): def render(self, row): row = join_row(row, self) tdclass, content = self.render_content(row) + + if tdclass == None: + tdclass = "" + if tdclass == "" and content == "": return "", ""

7 years, 7 months

Simplified wato info file saving code

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ebf46454375d8d0991d72e976fcaae8e2a8b14b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ebf46454375d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 1 10:20:03 2016 +0100 Simplified wato info file saving code --- web/htdocs/watolib.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 08beb23..068222a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1132,15 +1132,7 @@ class Folder(BaseFolder): "lock" : self._locked, "lock_subfolders" : self._locked_subfolders, } - try: - file(self.wato_info_path(), "w").write("%r\n" % wato_info) - except IOError, e: - if e.errno == 13: # Permission denied - raise MKGeneralException(_("Failed to write to the WATO folder '%s': %s. " - "Please check the filesystems permissions of this " - "folder.") % (self.title(), e)) - else: - raise + store.save_data_to_file(self.wato_info_path(), wato_info) def _ensure_folder_directory(self):

7 years, 7 months

4079 FIX Improved error handling in case a WATO folder can not be written

by Lars Michelsen

Module: check_mk Branch: master Commit: 0e697db8fd50b2cc19757285a24935a747f8c4f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e697db8fd50b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 1 10:15:32 2016 +0100 4079 FIX Improved error handling in case a WATO folder can not be written --- .werks/4079 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 10 +++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/4079 b/.werks/4079 new file mode 100644 index 0000000..ffa3d12 --- /dev/null +++ b/.werks/4079 @@ -0,0 +1,10 @@ +Title: Improved error handling in case a WATO folder can not be written +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480583719 + + diff --git a/ChangeLog b/ChangeLog index f5492e3..dbed8c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 3992 FIX: netapp_api_connection: fixed GUI display bug when editing rules * 4076 FIX: Git integration: Using mail address of user in author info * 4077 FIX: Fixed "Request URI too long" when cloning role after editing another one + * 4079 FIX: Improved error handling in case a WATO folder can not be written Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 4677b47..08beb23 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1132,7 +1132,15 @@ class Folder(BaseFolder): "lock" : self._locked, "lock_subfolders" : self._locked_subfolders, } - file(self.wato_info_path(), "w").write("%r\n" % wato_info) + try: + file(self.wato_info_path(), "w").write("%r\n" % wato_info) + except IOError, e: + if e.errno == 13: # Permission denied + raise MKGeneralException(_("Failed to write to the WATO folder '%s': %s. " + "Please check the filesystems permissions of this " + "folder.") % (self.title(), e)) + else: + raise def _ensure_folder_directory(self):

7 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016