From 26a37f2470afe674bb1a014e9465fa36f80c214d Mon Sep 17 00:00:00 2001 From: Manas Gupta Date: Mon, 27 Aug 2012 17:39:38 -0400 Subject: [PATCH 1/4] Workaround for #7 --- amonpy/protocols/zeromq.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amonpy/protocols/zeromq.py b/amonpy/protocols/zeromq.py index 5faf1d9..12c9fe8 100644 --- a/amonpy/protocols/zeromq.py +++ b/amonpy/protocols/zeromq.py @@ -5,7 +5,7 @@ class ZeroMQHandler(): def __init__(self, socktype=zmq.DEALER): self.ctx = zmq.Context.instance() self.socket = zmq.Socket(self.ctx, socktype) - self.socket.setsockopt(zmq.LINGER, 0) + #self.socket.setsockopt(zmq.LINGER, 0) self.socket.setsockopt(zmq.SWAP, 25000000) # 25MB disk swap address = "tcp://{0}".format(config.address) From 290e2f2f0fd9947b6096ca2c757c447e0514cfce Mon Sep 17 00:00:00 2001 From: Manas Gupta Date: Mon, 27 Aug 2012 17:47:35 -0400 Subject: [PATCH 2/4] Using secret_key instead of application_key --- amonpy/protocols/zeromq.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amonpy/protocols/zeromq.py b/amonpy/protocols/zeromq.py index 12c9fe8..28450b8 100644 --- a/amonpy/protocols/zeromq.py +++ b/amonpy/protocols/zeromq.py @@ -16,7 +16,7 @@ def close(self): def post(self, data, type=None): data = {"type": type, "content" : data} - if config.application_key: + if config.secret_key: data['secret_key'] = config.secret_key self.socket.send_json(data, zmq.NOBLOCK) From 7cd4c31cbd8fa451e0f527b2dd8ad85ae042670c Mon Sep 17 00:00:00 2001 From: Manas Gupta Date: Mon, 27 Aug 2012 18:28:47 -0400 Subject: [PATCH 3/4] Need to have a positive LINGER value otherwise connections will hang forever if remote end is down #7 --- amonpy/protocols/zeromq.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amonpy/protocols/zeromq.py b/amonpy/protocols/zeromq.py index 28450b8..8ef14d6 100644 --- a/amonpy/protocols/zeromq.py +++ b/amonpy/protocols/zeromq.py @@ -5,7 +5,7 @@ class ZeroMQHandler(): def __init__(self, socktype=zmq.DEALER): self.ctx = zmq.Context.instance() self.socket = zmq.Socket(self.ctx, socktype) - #self.socket.setsockopt(zmq.LINGER, 0) + self.socket.setsockopt(zmq.LINGER, 100) self.socket.setsockopt(zmq.SWAP, 25000000) # 25MB disk swap address = "tcp://{0}".format(config.address) From 334bf996d054214e697f3a595ba36002a75e7ff9 Mon Sep 17 00:00:00 2001 From: Manas Gupta Date: Wed, 29 Aug 2012 14:06:14 -0400 Subject: [PATCH 4/4] Removing disk swap --- amonpy/protocols/zeromq.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amonpy/protocols/zeromq.py b/amonpy/protocols/zeromq.py index 8ef14d6..4609d3d 100644 --- a/amonpy/protocols/zeromq.py +++ b/amonpy/protocols/zeromq.py @@ -6,7 +6,10 @@ def __init__(self, socktype=zmq.DEALER): self.ctx = zmq.Context.instance() self.socket = zmq.Socket(self.ctx, socktype) self.socket.setsockopt(zmq.LINGER, 100) - self.socket.setsockopt(zmq.SWAP, 25000000) # 25MB disk swap + # As there is no high water mark set - we don't really need this + # Additionally, its not possible to set location of these yet + # https://zeromq.jira.com/browse/LIBZMQ-410 + #self.socket.setsockopt(zmq.SWAP, 25000000) # 25MB disk swap address = "tcp://{0}".format(config.address) self.socket.connect(address)