feat: server refactoring
This commit is contained in:
@ -2,6 +2,7 @@ import threading
|
||||
import logging
|
||||
import zmq
|
||||
import time
|
||||
import replication
|
||||
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
log = logging.getLogger(__name__)
|
||||
@ -46,8 +47,6 @@ class ClientNetService(threading.Thread):
|
||||
|
||||
|
||||
def run(self):
|
||||
log.debug("Running Net service")
|
||||
|
||||
poller = zmq.Poller()
|
||||
poller.register(self.snapshot, zmq.POLLIN)
|
||||
poller.register(self.subscriber, zmq.POLLIN)
|
||||
@ -61,6 +60,12 @@ class ClientNetService(threading.Thread):
|
||||
if not items:
|
||||
log.error("No request ")
|
||||
|
||||
time.sleep(1)
|
||||
|
||||
def send(data):
|
||||
assert(issubclass(data, ReplicatedDatablock))
|
||||
data.push(self.publish)
|
||||
|
||||
def stop(self):
|
||||
self.exit_event.set()
|
||||
|
||||
@ -119,8 +124,6 @@ class ServerNetService(threading.Thread):
|
||||
self.state = 0
|
||||
|
||||
def run(self):
|
||||
log.debug("Running Server Net service")
|
||||
|
||||
poller = zmq.Poller()
|
||||
poller.register(self.snapshot, zmq.POLLIN)
|
||||
poller.register(self.pull, zmq.POLLIN)
|
||||
@ -131,4 +134,6 @@ class ServerNetService(threading.Thread):
|
||||
items = dict(poller.poll(10))
|
||||
|
||||
if not items:
|
||||
log.info("No request ")
|
||||
pass
|
||||
|
||||
time.sleep(1)
|
@ -35,6 +35,7 @@ class TestData(unittest.TestCase):
|
||||
self.server_api = Server()
|
||||
|
||||
def test_server_launching(self):
|
||||
log.info("test_server_launching")
|
||||
self.server_api.serve()
|
||||
time.sleep(1)
|
||||
self.assertEqual(self.server_api.state(),1)
|
||||
@ -48,6 +49,7 @@ class TestData(unittest.TestCase):
|
||||
self.assertEqual(isinstance(rep_sample,RepSampleData), True)
|
||||
|
||||
def test_client_connect(self):
|
||||
log.info("test_client_connect")
|
||||
self.client_api.connect()
|
||||
time.sleep(1)
|
||||
self.assertEqual(self.client_api.state(),1)
|
||||
@ -57,14 +59,6 @@ class TestData(unittest.TestCase):
|
||||
time.sleep(1)
|
||||
self.assertEqual(self.client_api.state(),0)
|
||||
|
||||
def test_client_add_rep(self):
|
||||
pass
|
||||
|
||||
|
||||
|
||||
def test_add_replicated_value(self):
|
||||
pass
|
||||
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user