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

feat: logging to debug

Browse Source
This commit is contained in:
Swann Martinez
2019-04-10 18:26:39 +02:00
parent f3be75ce3c
commit 26d4b152d4
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client.py
View File

@ -72,8 +72,9 @@ class RCFClient(object):
self.agent.daemon = True self.agent.daemon = True
self.agent.start() self.agent.start()
def connect(self, address, port): def connect(self, id, address, port):
self.pipe.send_multipart([b"CONNECT", (address.encode() if isinstance( self.pipe.send_multipart([b"CONNECT", (id.encode() if isinstance(
id, str) else id), (address.encode() if isinstance(
address, str) else address), b'%d' % port]) address, str) else address), b'%d' % port])
def set(self, key): def set(self, key):
@ -149,6 +150,7 @@ class RCFClientAgent(object):
command = msg.pop(0) command = msg.pop(0)
if command == b"CONNECT": if command == b"CONNECT":
self.id = msg.pop(0)
address = msg.pop(0) address = msg.pop(0)
port = int(msg.pop(0)) port = int(msg.pop(0))
@ -167,7 +169,7 @@ class RCFClientAgent(object):
value = helpers.dump(key) value = helpers.dump(key)
if value: if value:
logger.info(key,"dumped") logger.info("{} dumped".format(key))
# Send key-value pair on to server # Send key-value pair on to server
rcfmsg = message.RCFMessage(key=key, id=self.id, mtype="", body=value) rcfmsg = message.RCFMessage(key=key, id=self.id, mtype="", body=value)
@ -197,8 +199,8 @@ def rcf_client_agent(ctx, pipe):
if agent.state == State.INITIAL: if agent.state == State.INITIAL:
server = agent.server server = agent.server
if agent.server: if agent.server:
logger.info("I: waiting for server at %s:%d...", logger.info("%s: waiting for server at %s:%d...",
server.address, server.port) agent.id.decode(),server.address, server.port)
server.snapshot.send(b"SNAPSHOT_REQUEST") server.snapshot.send(b"SNAPSHOT_REQUEST")
agent.state = State.SYNCING agent.state = State.SYNCING
server_socket = server.snapshot server_socket = server.snapshot
@ -232,10 +234,10 @@ def rcf_client_agent(ctx, pipe):
helpers.load(rcfmsg.key,rcfmsg.body) helpers.load(rcfmsg.key,rcfmsg.body)
rcfmsg.store(agent.property_map) rcfmsg.store(agent.property_map)
action = "update" if rcfmsg.body else "delete" action = "update" if rcfmsg.body else "delete"
logging.info("I: received from {}:{},{} {}".format( logging.info("{}: received from {}:{},{} {}".format(agent.id,
server.address, rcfmsg.body.id, server.port, action)) server.address, rcfmsg.body.id, server.port, action))
else: else:
logger.info("IDLE") logger.info("{} nothing to do".format(agent.id))
logger.info("exit thread") logger.info("exit thread")
stop = False stop = False

6
operators.py
View File

@ -386,8 +386,8 @@ class session_join(bpy.types.Operator):
net_settings = context.scene.session_settings net_settings = context.scene.session_settings
# Scene setup # Scene setup
# if net_settings.session_mode == "CONNECT" and net_settings.clear_scene: if net_settings.session_mode == "CONNECT" and net_settings.clear_scene:
# clean_scene() clean_scene()
# Session setup # Session setup
if net_settings.username == "DefaultUser": if net_settings.username == "DefaultUser":
@ -398,7 +398,7 @@ class session_join(bpy.types.Operator):
client_instance = client.RCFClient() client_instance = client.RCFClient()
client_instance.connect("127.0.0.1",5555) client_instance.connect(net_settings.username,"127.0.0.1",5555)
# net_settings.is_running = True # net_settings.is_running = True

5
server.py
View File

@ -4,7 +4,7 @@ import time
from libs import zmq from libs import zmq
import message import message
logger = logging.getLogger(__name__) logger = logging.getLogger("Server")
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
class RCFServerAgent(): class RCFServerAgent():
@ -60,7 +60,7 @@ class RCFServerAgent():
identity = msg[0] identity = msg[0]
request = msg[1] request = msg[1]
print("asdasd")
if request == b"SNAPSHOT_REQUEST": if request == b"SNAPSHOT_REQUEST":
pass pass
else: else:
@ -81,6 +81,7 @@ class RCFServerAgent():
# Regular update routing (Clients / Client) # Regular update routing (Clients / Client)
elif self.collector_sock in socks: elif self.collector_sock in socks:
msg = message.RCFMessage.recv(self.collector_sock) msg = message.RCFMessage.recv(self.collector_sock)
logger.info("received object")
# Update all clients # Update all clients
msg.store(self.property_map) msg.store(self.property_map)
msg.send(self.pub_sock) msg.send(self.pub_sock)