Merge pull request #6 from johnnzz/project-0308

Project 0308

Author: johnnzz

students/johnn/project/dcd.py

@@ -13,6 +13,7 @@
 import logging
 import optparse
 import queue
+import socket
 
 # 
 parser = optparse.OptionParser()
@@ -22,14 +23,21 @@
 
 (options, args) = parser.parse_args()
 
+# hack to figure out my ip address
+s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+s.connect(("8.8.8.8", 80))
+myaddr = s.getsockname()[0]
+s.close()
+
 if options.admin_port is None:
     options.admin_port = "5561"
 
 if options.pub_port is None:
     options.pub_port = "5556"
 
-options.admin_interface = "tcp://*:{}".format(options.admin_port)
-options.pub_interface = "tcp://*:{}".format(options.pub_port)
+options.admin_interface = "tcp://{}:{}".format(myaddr,options.admin_port)
+options.pub_interface = "tcp://{}:{}".format(myaddr,options.pub_port)
+myinterfaces = ( options.admin_interface, options.pub_interface )
 
 if options.debug is None:
     options.stream_log_level = logging.INFO
@@ -71,37 +79,57 @@ def decode_command(message):
         command, key, value = (None, None, None)
     return ( command, key, value )
 
+def blob(config):
+    return repr( (myinterfaces, config.data, config.peers) )
+
 def admin(config):
     context = zmq.Context()
     admin = context.socket(zmq.REP)
     admin.bind(options.admin_interface)
     log.info("admin bound on {}".format(options.admin_interface))
+
+    talkback = context.socket(zmq.REQ)
+
     while True:
         command, key, value = decode_command(admin.recv_string())
         response = ""
         log.info("received command {}, key {}, value {}".format(command, key, value))
         if command == "dump":
-            log.info("DUMP: " + str(config.data))
-            response = str(config.data)
+            log.debug("dump request, responding {}".format(blob(config)))
+            log.info("dump request")
+            response = blob(config)
+            admin.send_string(response)
         if command == "put":
             log.info("putting {} {}".format(key, value))
             config.pub_queue.put((key, value))
             config.sub_queue.put(key)
             response = "ack"
+            admin.send_string(response)
         if command == "get":
             log.info("getting {}".format(key))
             try:
                 config.sub_queue.put(key)
                 value = config.get_value(key)
-                reponse = value
+                response = value
+                admin.send_string(response)
             except KeyError:
                 config.sub_queue.put(key)
                 response = ""
+                admin.send_string(response)
         if command == "link":
-            log.info("linking {}".format(value))
-            config.link_queue.put(value)
-            response = "ack"
-        admin.send_string(response)
+            response = "initiating a link request to remote admin port at {}".format(value)
+            log.debug(response)
+            admin.send_string(response)
+            log.debug("opening connection to " + str(value))
+            talkback.connect(value)
+            cmd = ("('dump', None, None)")
+            log.debug("sending command " + cmd )
+            talkback.send_string(cmd)  
+            message = talkback.recv_string()
+            log.debug("got " + str(message) )
+            remote_ports, data, peers = eval(message)
+            remote_admin, remote_pub = remote_ports
+            log.debug("remote_admin {}, remote_pub {}, data {}, peers {}".format(remote_admin, remote_pub, data, peers))
 
 def pub(config):
     context = zmq.Context()
@@ -151,6 +179,7 @@ def __init__(self):
         self.sub_queue = queue.Queue()
         self.link_queue = queue.Queue()
         self.data = {}
+        self.peers = {}
     def set_value(self, key, value):
         self.data[key] = value
     def get_value(self, key):

students/johnn/project/dcli

@@ -15,9 +15,10 @@ parser.add_option("-s", "--server", dest="server",
 parser.add_option("-g", "--get", dest="get", action="store_true", help="Send a data query the server")
 parser.add_option("-p", "--put", dest="put", action="store_true", help="Set the data value on the server")
 parser.add_option("-k", "--key", dest="key", help="key to process")
+parser.add_option("-r", "--raw", dest="raw", help="debug only - send raw string to server")
 parser.add_option("-v", "--value", dest="value", help="key to process")
 parser.add_option("-e", "--echo_test", dest="test", help="Send an echo test to the server")
-parser.add_option("-l", "--link", dest="link", action="store_true", help="Link this server to another")
+parser.add_option("-l", "--link", dest="link", help="Link this server to another")
 parser.add_option("-d", "--debug", dest="debug", action="store_true", help="Print debug information to the screen")
 parser.add_option("--dump", dest="dump", action="store_true", help="Show all values in the database")
 
@@ -83,7 +84,10 @@ if options.test:
     send_message(build_message("echo_test", "", options.value))
 
 if options.link:
-    send_message(build_message("link", "", options.value))
+    send_message(build_message("link", "", options.link))
 
 if options.dump:
     send_message(build_message("dump", "", ""))
+
+if options.raw:
+    send_message(options.raw)