Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: rename snpshot to command for explicity

Browse Source
This commit is contained in:
Swann 2019-07-23 20:24:07 +02:00
parent 7ff01273be
commit 0047094b2a
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
replication_client.py
View File

@ -120,9 +120,9 @@ class ClientNetService(threading.Thread):
""" """
if self.state == STATE_INITIAL: if self.state == STATE_INITIAL:
logger.debug("connecting on {}:{}".format(address, port)) logger.debug("connecting on {}:{}".format(address, port))
self.snapshot = self.context.socket(zmq.DEALER) self.command = self.context.socket(zmq.DEALER)
self.snapshot.setsockopt(zmq.IDENTITY, self._id.encode()) self.command.setsockopt(zmq.IDENTITY, self._id.encode())
self.snapshot.connect("tcp://{}:{}".format(address, port)) self.command.connect("tcp://{}:{}".format(address, port))
self.subscriber = self.context.socket(zmq.SUB) self.subscriber = self.context.socket(zmq.SUB)
self.subscriber.setsockopt_string(zmq.SUBSCRIBE, '') self.subscriber.setsockopt_string(zmq.SUBSCRIBE, '')
@ -139,7 +139,7 @@ class ClientNetService(threading.Thread):
def run(self): def run(self):
logger.info("{} online".format(self._id)) logger.info("{} online".format(self._id))
poller = zmq.Poller() poller = zmq.Poller()
poller.register(self.snapshot, zmq.POLLIN) poller.register(self.command, zmq.POLLIN)
poller.register(self.subscriber, zmq.POLLIN) poller.register(self.subscriber, zmq.POLLIN)
poller.register(self.publish, zmq.POLLOUT) poller.register(self.publish, zmq.POLLOUT)
@ -150,7 +150,7 @@ class ClientNetService(threading.Thread):
""" """
if self.state == STATE_INITIAL: if self.state == STATE_INITIAL:
logger.debug('{} : request snapshot'.format(self._id)) logger.debug('{} : request snapshot'.format(self._id))
self.snapshot.send(b"SNAPSHOT_REQUEST") self.command.send(b"SNAPSHOT_REQUEST")
self.state = STATE_SYNCING self.state = STATE_SYNCING
"""NET IN """NET IN
@ -160,10 +160,10 @@ class ClientNetService(threading.Thread):
""" """
items = dict(poller.poll(1)) items = dict(poller.poll(1))
if self.snapshot in items: if self.command in items:
if self.state == STATE_SYNCING: if self.state == STATE_SYNCING:
datablock = ReplicatedDatablock.pull( datablock = ReplicatedDatablock.pull(
self.snapshot, self._factory) self.command, self._factory)
if 'SNAPSHOT_END' in datablock.buffer: if 'SNAPSHOT_END' in datablock.buffer:
self.state = STATE_ACTIVE self.state = STATE_ACTIVE
@ -183,7 +183,7 @@ class ClientNetService(threading.Thread):
if not items: if not items:
logger.error("No request ") logger.error("No request ")
self.snapshot.close() self.command.close()
self.subscriber.close() self.subscriber.close()
self.publish.close() self.publish.close()
@ -227,7 +227,7 @@ class ServerNetService(threading.Thread):
self._rep_store = store_reference self._rep_store = store_reference
self.context = zmq.Context.instance() self.context = zmq.Context.instance()
self.snapshot = None self.command = None
self.publisher = None self.publisher = None
self.pull = None self.pull = None
self.state = 0 self.state = 0
@ -237,10 +237,10 @@ class ServerNetService(threading.Thread):
def listen(self, port=5560): def listen(self, port=5560):
try: try:
# Update request # Update request
self.snapshot = self.context.socket(zmq.ROUTER) self.command = self.context.socket(zmq.ROUTER)
self.snapshot.setsockopt(zmq.IDENTITY, b'SERVER') self.command.setsockopt(zmq.IDENTITY, b'SERVER')
self.snapshot.setsockopt(zmq.RCVHWM, 60) self.command.setsockopt(zmq.RCVHWM, 60)
self.snapshot.bind("tcp://*:{}".format(port)) self.command.bind("tcp://*:{}".format(port))
# Update all clients # Update all clients
self.publisher = self.context.socket(zmq.PUB) self.publisher = self.context.socket(zmq.PUB)
@ -268,7 +268,7 @@ class ServerNetService(threading.Thread):
def run(self): def run(self):
logger.debug("Server is online") logger.debug("Server is online")
poller = zmq.Poller() poller = zmq.Poller()
poller.register(self.snapshot, zmq.POLLIN) poller.register(self.command, zmq.POLLIN)
poller.register(self.pull, zmq.POLLIN) poller.register(self.pull, zmq.POLLIN)
self.state = STATE_ACTIVE self.state = STATE_ACTIVE
@ -278,8 +278,8 @@ class ServerNetService(threading.Thread):
socks = dict(poller.poll(1)) socks = dict(poller.poll(1))
# Snapshot system for late join (Server - Client) # Snapshot system for late join (Server - Client)
if self.snapshot in socks: if self.command in socks:
msg = self.snapshot.recv_multipart(zmq.DONTWAIT) msg = self.command.recv_multipart(zmq.DONTWAIT)
identity = msg[0] identity = msg[0]
request = msg[1] request = msg[1]
@ -289,13 +289,13 @@ class ServerNetService(threading.Thread):
if request == b"SNAPSHOT_REQUEST": if request == b"SNAPSHOT_REQUEST":
# Sending snapshots # Sending snapshots
for key, item in self._rep_store.items(): for key, item in self._rep_store.items():
self.snapshot.send(identity, zmq.SNDMORE) self.command.send(identity, zmq.SNDMORE)
item.push(self.snapshot) item.push(self.command)
# Snapshot end # Snapshot end
self.snapshot.send(identity, zmq.SNDMORE) self.command.send(identity, zmq.SNDMORE)
RepCommand(owner='server', pointer='SNAPSHOT_END').push( RepCommand(owner='server', pointer='SNAPSHOT_END').push(
self.snapshot) self.command)
# Regular update routing (Clients / Server / Clients) # Regular update routing (Clients / Server / Clients)
if self.pull in socks: if self.pull in socks:
@ -312,7 +312,7 @@ class ServerNetService(threading.Thread):
datablock.push(self.publisher) datablock.push(self.publisher)
self.snapshot.close() self.command.close()
self.pull.close() self.pull.close()
self.publisher.close() self.publisher.close()