Module: check_mk
Branch: master
Commit: 2f5a7e69d788c3c0fabf78f6f95a56c1acbf1e57
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f5a7e69d788c3…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Feb 15 13:46:49 2013 +0100
Multisite: Removed uuid module dependency to be compatible to python < 2.5
Conflicts:
ChangeLog
---
ChangeLog | 2 ++
web/htdocs/weblib.py | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dffdfac..9495170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
* Add: Memory and Swap for Solaris Agent
* Add: Monitoring of ESX (VMware) Hosts
+1.2.2b3
+ * Multisite: Removed uuid module dependency to be compatible to python < 2.5
1.2.2b2:
Checks & Agents:
diff --git a/web/htdocs/weblib.py b/web/htdocs/weblib.py
index 3979f5a..bbe379e 100644
--- a/web/htdocs/weblib.py
+++ b/web/htdocs/weblib.py
@@ -90,7 +90,7 @@ def ajax_tree_openclose():
# | Saves and loads selected row information of the current user |
# +----------------------------------------------------------------------+
-import uuid, os, time
+import os, time
from lib import make_nagios_directory
def init_selection():
@@ -116,7 +116,8 @@ def cleanup_old_selections():
# Generates a selection id or uses the given one
def selection_id():
if not html.has_var('selection'):
- html.add_var('selection', str(uuid.uuid1())) # generate when not set
+ sel_id = file('/proc/sys/kernel/random/uuid').read().strip()
+ html.add_var('selection', sel_id)
return html.var('selection')
def get_rowselection(ident):