Commit 3c2fedad authored by Nicolas Delaby's avatar Nicolas Delaby

revert r27925 as scheme is not required and this modification is too brutal

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27960 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2a457b6d
...@@ -86,7 +86,7 @@ class CacheTool(BaseTool): ...@@ -86,7 +86,7 @@ class CacheTool(BaseTool):
if getattr(cp, 'getSpecialiseValue', None) is not None: if getattr(cp, 'getSpecialiseValue', None) is not None:
memcached_plugin = cp.getSpecialiseValue() memcached_plugin = cp.getSpecialiseValue()
if memcached_plugin is not None: if memcached_plugin is not None:
server = memcached_plugin.getUrlString('')[len('memcached://'):] server = memcached_plugin.getUrlString('')
init_dict = { init_dict = {
'server': server, 'server': server,
'server_max_key_length': memcached_plugin.getServerMaxKeyLength(), 'server_max_key_length': memcached_plugin.getServerMaxKeyLength(),
......
...@@ -282,8 +282,7 @@ if memcache is not None: ...@@ -282,8 +282,7 @@ if memcache is not None:
memcached_plugin = self.restrictedTraverse(plugin_path, None) memcached_plugin = self.restrictedTraverse(plugin_path, None)
if memcached_plugin is None: if memcached_plugin is None:
raise ValueError, 'Memcached Plugin does not exists: %r' % (plugin_path,) raise ValueError, 'Memcached Plugin does not exists: %r' % (plugin_path,)
url_string = memcached_plugin.getUrlString('')[len('memcached://'):] dictionary = MemcachedDict((memcached_plugin.getUrlString(''),),
dictionary = MemcachedDict((url_string,),
server_max_key_length=memcached_plugin.getServerMaxKeyLength(), server_max_key_length=memcached_plugin.getServerMaxKeyLength(),
server_max_value_length=memcached_plugin.getServerMaxValueLength()) server_max_value_length=memcached_plugin.getServerMaxValueLength())
memcached_dict_pool.memcached_dict = dictionary memcached_dict_pool.memcached_dict = dictionary
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment