From 77a9161e07489ade9332eab2b9e4894b7a2f33e0 Mon Sep 17 00:00:00 2001
From: Muneeb Ali <muneeb@ali.vc>
Date: Mon, 2 Feb 2015 18:43:41 -0500
Subject: [PATCH] fixed small error, wasn't initializing dht_server

small changes

formatted get response plus other changes
---
 openname_cli.py | 20 ++++++++++++++++++--
 opennamed.py    |  6 ++++--
 opennamed.tac   |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/openname_cli.py b/openname_cli.py
index 638a61e4a..307047c02 100644
--- a/openname_cli.py
+++ b/openname_cli.py
@@ -40,8 +40,23 @@ def printValue(value):
     logger.info(pretty_dump(value))
 
 
+def getFormat(result):
+    reply = {}
+
+    value = json.loads(json.dumps(result))
+
+    try:
+        value = ast.literal_eval(value)
+    except:
+        pass
+
+    reply['value'] = value
+
+    return reply
+
+
 def printError(error):
-    
+
     reply = {}
     reply['error'] = "Got an error"
 
@@ -218,8 +233,8 @@ def run_cli():
         reply = {}
         value = args.data
 
-        logger.debug('Storing %s', value)
         key = coinkit.hex_hash160(value)
+        logger.debug('Storing %s', value)
 
         client = proxy.callRemote('set', key, value)
 
@@ -227,6 +242,7 @@ def run_cli():
         logger.debug('Get %s', args.hash)
 
         client = proxy.callRemote('get', args.hash)
+        client.addCallback(getFormat)
 
     client.addCallback(printValue).addErrback(printError).addBoth(shutDown)
     reactor.run()
diff --git a/opennamed.py b/opennamed.py
index f64496dd6..d4687ff59 100644
--- a/opennamed.py
+++ b/opennamed.py
@@ -14,6 +14,7 @@ import os
 import sys
 import subprocess
 import signal
+import json
 
 from txjsonrpc.netstring import jsonrpc
 from twisted.internet import reactor
@@ -84,8 +85,9 @@ class OpennamedRPC(jsonrpc.JSONRPC):
         reply = {}
 
         try:
-            test_value = json.loads(json.dumps(value))
-        except:
+            test_value = json.loads(value)
+        except Exception as e:
+            print e
             reply['error'] = "value not JSON, not storing"
             return reply
 
diff --git a/opennamed.tac b/opennamed.tac
index 42a1fd190..184a95fda 100644
--- a/opennamed.tac
+++ b/opennamed.tac
@@ -28,7 +28,7 @@ from opennamed import OpennamedRPC
 
 application = service.Application("opennamed")
 
-factory_openname = jsonrpc.RPCFactory(OpennamedRPC())
+factory_openname = jsonrpc.RPCFactory(OpennamedRPC(dht_server))
 
 server_openname = internet.TCPServer(OPENNAMED_PORT, factory_openname)
 server_openname.setServiceParent(application)