cherokee at cherokee-project
Nov 18, 2009, 1:55 AM
Post #1 of 1
(129 views)
Permalink
|
|
[3837] cherokee/trunk/admin/GraphManager.py: Fixes the RRD detection.
|
|
Revision: 3837
http://svn.cherokee-project.com/changeset/3837
Author: alo
Date: 2009-11-18 10:55:12 +0100 (Wed, 18 Nov 2009)
Log Message:
-----------
Fixes the RRD detection. Cherokee-admin was performing too many checks
in order to figure whether the RRD data collector was enabled.
Modified Paths:
--------------
cherokee/trunk/admin/GraphManager.py
Modified: cherokee/trunk/admin/GraphManager.py
===================================================================
--- cherokee/trunk/admin/GraphManager.py 2009-11-18 09:55:10 UTC (rev 3836)
+++ cherokee/trunk/admin/GraphManager.py 2009-11-18 09:55:12 UTC (rev 3837)
@@ -3,20 +3,9 @@
from configured import *
def graphs_are_active (cfg):
- if not cfg.get_val("server!collector"):
- return False
-
- rrd_dir = cfg.get_val("server!collector!database_dir", CHEROKEE_RRD_DIR)
+ return cfg.get_val("server!collector") != None
- img = os.path.join (rrd_dir, "images/server_traffic_1h.png")
- try:
- info = os.stat(img)
- except OSError:
- return False
- return True
-
-
def graphs_get_images (cfg, filter):
rrd_dir = cfg.get_val("server!collector!database_dir", CHEROKEE_RRD_DIR)
img_dir = os.path.join (rrd_dir, "images")
|
