Module: check_mk
Branch: master
Commit: 0b7fd5cfa4626806fef98dd07886c276700d677d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b7fd5cfa46268…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu May 10 09:27:44 2012 +0200
WATO: Fix minor problem with replication priority
---
web/htdocs/wato.py | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 573dc9a..48f9052 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -6186,6 +6186,7 @@ def mode_sites(phase):
+ "</th><th>" + _("Timeout")
+ "</th><th>" + _("Pers.")
+ "</th><th>" + _("Replication")
+ + "</th><th>" + _("Prio")
+ "</th><th>" + _("Login")
+ "</th></tr>\n")
@@ -6238,11 +6239,14 @@ def mode_sites(phase):
if site.get("replication") == "slave":
repl = _("Slave")
elif site.get("replication") == "peer":
- repl = _("Peer") + _(" - Priority %s") %
site.get("repl_priority",0)
+ repl = _("Peer")
else:
- repl = _("Local - Priority %s") %
site.get("repl_priority",0)
+ repl = ""
html.write("<td>%s</td>" % repl)
+ html.write("<td class=number>%s</td>" %
+ ( site.get("replication") != "slave" and
str(site.get("repl_priority", 0)) or ""))
+
# Login-Button for Replication
html.write("<td>")
if repl:
@@ -6580,7 +6584,8 @@ def mode_edit_site(phase):
html.write("<br><br>")
html.write("<b>%s</b><br><i>%s</i><br>"
% (
_("Peer replication priority"),
- _("The replication priority is used to determine the master site from the
available peers and local sites.<br>"
+ _("The replication priority is used to determine the master site "
+ "from the available peers and local sites. "
"The site with the highest number takes precedence.")))
html.number_input("repl_priority", site.get("repl_priority", 0),
size=2)
@@ -7140,7 +7145,7 @@ def get_login_secret(create_on_demand = False):
urandom = file("/dev/urandom")
while len(secret) < 32:
c = urandom.read(1)
- if ord(c) >= 33 and ord(c) <= 127:
+ if ord(c) >= 48 and ord(c) <= 90:
secret += c
write_settings_file(path, secret)
return secret