[Erp5-report] r16844 - /erp5/trunk/products/ERP5Type/Tool/CacheTool.py

[nobody at svn.erp5.org]

Author: ivan
Date: Fri Oct  5 09:57:28 2007
New Revision: 16844

URL: http://svn.erp5.org?rev=16844&view=rev
Log:
Add separate statistics ZMI page.

Modified:
    erp5/trunk/products/ERP5Type/Tool/CacheTool.py

Modified: erp5/trunk/products/ERP5Type/Tool/CacheTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/CacheTool.py?rev=16844&r1=16843&r2=16844&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/CacheTool.py (original)
+++ erp5/trunk/products/ERP5Type/Tool/CacheTool.py Fri Oct  5 09:57:28 2007
@@ -54,10 +54,17 @@
   security = ClassSecurityInfo()
   manage_options = ({'label': 'Configure',
                                 'action': 'cache_tool_configure',
-                    },) + BaseTool.manage_options
+                    },
+                    {'label': 'Statistics',
+                              'action': 'cache_tool_statistics',
+                    },
+                    ) + BaseTool.manage_options
 
   security.declareProtected( Permissions.ManagePortal, 'cache_tool_configure')
   cache_tool_configure = DTMLFile('cache_tool_configure', _dtmldir)
+  
+  security.declareProtected( Permissions.ManagePortal, 'cache_tool_statistics')
+  cache_tool_statistics = DTMLFile('cache_tool_statistics', _dtmldir)
   
   def __init__(self):
     BaseTool.__init__(self)
@@ -228,7 +235,8 @@
     ram_cache_root = self.getRamCacheRoot()
     for cf_key, cf_value in ram_cache_root.items():
       for cp in cf_value.getCachePluginList():
-        cp_total_size = cp.getCachePluginTotalMemorySize()
+        cp_total_size, cp_cache_keys_total_size = cp.getCachePluginTotalMemorySize()
         total_size += cp_total_size
-        stats[cf_key] = cp_total_size
-    return total_size, stats
+        stats[cf_key] = dict(total = cp_total_size,
+                             cp_cache_keys_total_size = cp_cache_keys_total_size)
+    return dict(total_size = total_size, stats = stats)