Module: check_mk
Branch: master
Commit: 798c3e1e262759fe051559fbc62307f8ace57ab9
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=798c3e1e262759…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue May 10 09:07:22 2011 +0200
FIX: Multisite: avoid duplicate import of plugins
This happend in a local OMD setup. Also the plugins are now
read in alphabetical order.
---
ChangeLog | 1 +
web/htdocs/views.py | 15 ++++++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5a56adc..8d8a241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@
* FIX: custom_style_sheet now also honored by sidebar
* FIX: ignore case when sorting groups in ...groups snapin
* FIX: Fixed handling of embedded graphs to support the changes made to
+ * FIX: avoid duplicate import of plugins in OMD local installation
the PNP webservice
* Added snmp_uptime, uptime and printer_supply perfometers
* Allow for displaying service data in host tables
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 9f1b26e..45dc34b 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -195,16 +195,21 @@ class Filter:
# Load all view plugins
plugins_path = defaults.web_dir + "/plugins/views"
-for fn in os.listdir(plugins_path):
+fns = os.listdir(plugins_path)
+fns.sort()
+for fn in fns:
if fn.endswith(".py"):
execfile(plugins_path + "/" + fn)
if defaults.omd_root:
local_plugins_path = defaults.omd_root +
"/local/share/check_mk/web/plugins/views"
- if os.path.exists(local_plugins_path):
- for fn in os.listdir(local_plugins_path):
- if fn.endswith(".py"):
- execfile(local_plugins_path + "/" + fn)
+ if local_plugins_path != plugins_path: # honor ./setup.sh in site
+ if os.path.exists(local_plugins_path):
+ fns = os.listdir(local_plugins_path)
+ fns.sort()
+ for fn in fns:
+ if fn.endswith(".py"):
+ execfile(local_plugins_path + "/" + fn)
# Declare permissions for builtin views
config.declare_permission_section("view", "Builtin views")