Commit 20b86296 authored by Jeremy Hylton's avatar Jeremy Hylton

Remove is_connected stuff (not supported w/ZEO1).

Add optional cache_size argument.
parent 83d6d826
...@@ -65,7 +65,7 @@ def run_server(storage, addr, rd, wr): ...@@ -65,7 +65,7 @@ def run_server(storage, addr, rd, wr):
os.unlink(addr) os.unlink(addr)
def start_zeo(storage, cache=None, cleanup=None, domain="AF_INET", def start_zeo(storage, cache=None, cleanup=None, domain="AF_INET",
storage_id="1"): storage_id="1", cache_size=20000000):
"""Setup ZEO client-server for storage. """Setup ZEO client-server for storage.
Returns a ClientStorage instance and a ZEOClientExit instance. Returns a ClientStorage instance and a ZEOClientExit instance.
...@@ -84,9 +84,7 @@ def start_zeo(storage, cache=None, cleanup=None, domain="AF_INET", ...@@ -84,9 +84,7 @@ def start_zeo(storage, cache=None, cleanup=None, domain="AF_INET",
pid, exit = start_zeo_server(storage, addr) pid, exit = start_zeo_server(storage, addr)
s = ZEO.ClientStorage.ClientStorage(addr, storage_id, s = ZEO.ClientStorage.ClientStorage(addr, storage_id,
debug=1, client=cache) debug=1, client=cache,
if hasattr(s, 'is_connected'): cache_size=cache_size)
while not s.is_connected():
time.sleep(0.1)
return s, exit, pid return s, exit, pid
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