more relay stuff, setting up server

1 files changed, 21 insertions, 15 deletions

diff --git a/python/rpc.py b/python/rpc.py
index e71eb04..461ba21 100644
--- a/python/rpc.py
+++ b/python/rpc.py
@@ -16,38 +16,44 @@ class CortexRPC(object):
     print("Connecting to RPC on port {}".format(os.getenv('RPC_PORT')))
     self.rpc = zerorpc.Server(self)
     self.rpc.bind("tcp://127.0.0.1:" + os.getenv('RPC_PORT'))
-    gevent.spawn(self.started)
+    gevent.spawn(self.connected)
     self.rpc.run()
 
-  def started(self):
+  def connected(self):
     print("RPC running on port {}".format(os.getenv('RPC_PORT')))
-    self.reconnect()
-    print("defer sending a file...")
-    gevent.sleep(2)
-    self.send_file("test.png")
-
-  def reconnect(self):
     print("Connecting to Relay on port {}".format(os.getenv('RELAY_PORT')))
     self.relay = zerorpc.Client()
     self.relay.connect("tcp://127.0.0.1:" + os.getenv('RELAY_PORT'))
     val = None
     try:
       val = self.relay.connected("rpc")
-      print("rpc connected... {}".format(val))
+      print("rpc connected...".format(val))
     except zerorpc.TimeoutExpired:
-      print("timeout")
+      print("rpc timeout :(")
+    # print("defer sending a file...")
+    # gevent.sleep(2)
+    # self.send_file("test.png")
     return val
 
   def send_param(self, key, value):
     print("aloha. {}: {}".format(key, value))
     if self._listener is not None:
       self._listener(key, value)
+    else:
+      print("No listener provided to CortexRPC")
+    return "ok"
+
+  def get_params(self):
+    print("get params call received")
+    return "lmao ok"
 
-  def send_file(self, file):
-    print("sending a file...")
-    file = '01234567' * 8 * 8 * 8 * 8 * 2
-    self.relay.send_file(file)
-    pass
+  def send_frame(self, frame):
+    if self.relay is not None:
+      print("sending a frame...")
+      frame = '01234567' * 8 * 8 * 8 * 8 * 2
+      self.relay.send_frame('frame_00000.png', frame)
+    else:
+      print("Relay not ready...")
 
 if __name__ == '__main__':
   def log_param(key, value):