cherokee at cherokee-project
Oct 14, 2009, 3:43 PM
Post #1 of 1
(134 views)
Permalink
|
|
[3707] cherokee/trunk/admin: Fixes incorrect stats notification.
|
|
Revision: 3707
http://svn.cherokee-project.com/changeset/3707
Author: taher
Date: 2009-10-15 00:43:36 +0200 (Thu, 15 Oct 2009)
Log Message:
-----------
Fixes incorrect stats notification. http://bugs.cherokee-project.com/592
Modified Paths:
--------------
cherokee/trunk/admin/PageVServers.py
cherokee/trunk/admin/static/images/Makefile.am
Added Paths:
-----------
cherokee/trunk/admin/static/images/exclamation.png
Modified: cherokee/trunk/admin/PageVServers.py
===================================================================
--- cherokee/trunk/admin/PageVServers.py 2009-10-14 17:15:11 UTC (rev 3706)
+++ cherokee/trunk/admin/PageVServers.py 2009-10-14 22:43:36 UTC (rev 3707)
@@ -145,6 +145,7 @@
ENABLED_IMAGE = self.InstanceImage('tick.png', _('Yes'))
DISABLED_IMAGE = self.InstanceImage('cross.png', _('No'))
+ OFFLINE_IMAGE = self.InstanceImage('exclamation.png', _('Offline'))
for prio in sorted_vservers:
nick = self._cfg.get_val('vserver!%s!nick'%(prio))
@@ -186,15 +187,13 @@
else:
logging = DISABLED_IMAGE
- if not collector_val:
- tmp = self._cfg.get_val ('server!collector')
- if tmp:
- collector_val = "1"
-
- if collector_val:
+ collector_status = self._cfg.get_val ('server!collector')
+ if collector_val=="0":
+ collector = DISABLED_IMAGE
+ elif collector_status:
collector = ENABLED_IMAGE
else:
- collector = DISABLED_IMAGE
+ collector = OFFLINE_IMAGE
if nick != "default":
link_del = self.AddDeleteLink ('/ajax/update', 'vserver!%s'%(prio))
Modified: cherokee/trunk/admin/static/images/Makefile.am
===================================================================
--- cherokee/trunk/admin/static/images/Makefile.am 2009-10-14 17:15:11 UTC (rev 3706)
+++ cherokee/trunk/admin/static/images/Makefile.am 2009-10-14 22:43:36 UTC (rev 3707)
@@ -8,7 +8,8 @@
SILK_ICONS = \
cross.png \
-tick.png
+tick.png \
+exclamation.png
adminstaticdir = "$(datadir)/cherokee/admin/static/images"
adminstatic_DATA = \
Added: cherokee/trunk/admin/static/images/exclamation.png
===================================================================
(Binary files differ)
Property changes on: cherokee/trunk/admin/static/images/exclamation.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
|
