robot0nfire/fl0w-old
robot0nfire/fl0w-old
Archived
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Peers logic error fix, dummy pipe for sensor

Browse source
This commit is contained in:
Philip Trauner 2016-12-07 19:12:35 +01:00
parent 160f731281
commit 1980d1c06d
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Server/Server.py
View file

@ -109,17 +109,17 @@ class Peers(Route):
if "channel" in data: if "channel" in data:
check_type = True check_type = True
# We can use the in keyword this way # We can use the in keyword this way
if type(data["channel"]) is int: if type(data["channel"]) is int:
data["channel"] = (data["channel"], ) data["channel"] = (data["channel"], )
peers = handler.peers peers = handler.peers
for peer_id in peers: for peer_id in peers:
# Only check for type inclusion if check_type is True # Only check for type inclusion if check_type is True
if not check_type or peers[peer_id].channel in data["channel"]: if not check_type or peers[peer_id].channel in data["channel"]:
peer = peers[peer_id] peer = peers[peer_id]
if peer is not handler: if peer is not handler:
out[peer_id] = {"name" : peer.name, out[peer_id] = {"name" : peer.name,
"address" : peer.address, "port" : peer.port, "address" : peer.address, "port" : peer.port,
"channel" : peer.channel} "channel" : peer.channel}
handler.send(out, handler.reverse_routes[self]) handler.send(out, handler.reverse_routes[self])
@ -129,7 +129,7 @@ class Handler(Server):
self.broadcast = broadcast self.broadcast = broadcast
self.channel = None self.channel = None
self.name = "Unknown" self.name = "Unknown"
def ready(self): def ready(self):
Logging.info("Handler for '%s:%d' ready." % (self.address, self.port)) Logging.info("Handler for '%s:%d' ready." % (self.address, self.port))
@ -174,19 +174,20 @@ for channel in Subscribe.CHANNELS:
compile = Compile(config.source_path, config.binary_path) compile = Compile(config.source_path, config.binary_path)
server = make_server(config.server_address[0], config.server_address[1], server = make_server(config.server_address[0], config.server_address[1],
server_class=WSGIServer, handler_class=WebSocketWSGIRequestHandler, server_class=WSGIServer, handler_class=WebSocketWSGIRequestHandler,
app=None) app=None)
server.initialize_websockets_manager() server.initialize_websockets_manager()
server.set_app(WebSocketWSGIApplication(handler_cls=Handler, server.set_app(WebSocketWSGIApplication(handler_cls=Handler,
handler_args={"debug" : config.debug, "broadcast" : broadcast, handler_args={"debug" : config.debug, "broadcast" : broadcast,
"websockets" : server.manager.websockets, "websockets" : server.manager.websockets,
"routes" : {"info" : Info(), "routes" : {"info" : Info(),
"subscribe" : Subscribe(), "subscribe" : Subscribe(),
"hostname" : DummyPipe(), "hostname" : DummyPipe(),
"processes" : DummyPipe(), "processes" : DummyPipe(),
"peers" : Peers()}})) "peers" : Peers(),
"sensor" : DummyPipe()}}))
try: try: