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

fix(client): fix client key remote remove after disconnecting

Browse Source
This commit is contained in:
swann
2019-05-01 19:18:54 +02:00
parent 8c6f57efbb
commit 9170dea52c
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client.py
View File

@ -227,7 +227,7 @@ class RCFClientAgent(object):
port = int(msg.pop(0))
if self.server is None:
if address == '127.0.0.1' or 'localhost' :
if address == '127.0.0.1' or address == 'localhost' :
self.admin = True
self.server = RCFServer(self.ctx, address, port, self.id)
self.publisher.connect(
@ -239,13 +239,18 @@ class RCFClientAgent(object):
elif command == b"DISCONNECT":
if self.admin is False:
uid = self.id.decode()
delete_user = message.RCFMessage(
key="Client/{}".format(uid), id=self.id, body=None)
delete_user.send(self.publisher)
for k,v in self.property_map.items():
if v.body["id"] == uid:
delete_msg = message.RCFMessage(
key=k, id=self.id, body=None)
# delete_msg.store(self.property_map)
delete_msg.send(self.publisher)
# TODO: Do we need to pass every object rights to the moderator ?
# for k,v in self.property_map.items():
# if v.body["id"] == uid:
# delete_msg = message.RCFMessage(
# key=k, id=self.id, body=None)
# # delete_msg.store(self.property_map)
# delete_msg.send(self.publisher)
elif command == b"SET":
key = umsgpack.unpackb(msg[0])

2
message.py
View File

@ -32,7 +32,7 @@ class RCFMessage(object):
"""Store me in a dict if I have anything to store"""
# this currently erasing old value
if self.key is not None:
if self in dikt and self.body == 'None':
if self.body == 'None':
logger.info("erasing key {}".format(self.key))
del dikt[self.key]
else: