From edb7fcdcff01938c3ea7f328bf28591674bf68e3 Mon Sep 17 00:00:00 2001
From: Marin Atanasov Nikolov <dnaeon@gmail.com>
Date: Mon, 31 Mar 2014 10:43:57 +0300
Subject: [PATCH] The client should be receiving result in JSON format

---
 src/vpoller-client    | 2 +-
 src/vpoller/client.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vpoller-client b/src/vpoller-client
index aea4f02..fa1953b 100755
--- a/src/vpoller-client
+++ b/src/vpoller-client
@@ -125,7 +125,7 @@ Options:
     if args['--helper'] and args['--helper'] in helpers:
         result = vpoller_helpers(args['--helper'], msg, data)
     else:
-        result = json.dumps(json.loads(data), indent=4)
+        result = json.dumps(data, indent=4)
     
     print result
 
diff --git a/src/vpoller/client.py b/src/vpoller/client.py
index 79d320e..92a3373 100644
--- a/src/vpoller/client.py
+++ b/src/vpoller/client.py
@@ -99,7 +99,7 @@ def run(self, msg):
             # Do we have a reply?
             if socks.get(self.zclient) == zmq.POLLIN:
                 logging.debug('Received reply on client socket')
-                result = self.zclient.recv()
+                result = self.zclient.recv_json()
                 break
             else:
                 # We didn't get a reply back from the server, let's retry