Skip to content

Commit cfb4f21

Browse files
committed
fix HTTP
1 parent f7a4a8e commit cfb4f21

File tree

5 files changed

+87
-199
lines changed

5 files changed

+87
-199
lines changed

hololinked/server/__init__.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@ def run(*servers: BaseProtocolServer) -> None:
1919
things = list(set(things)) # remove duplicates
2020

2121
zmq_servers = [server for server in servers if isinstance(server, (ZMQServer, RPCServer))]
22+
rpc_server = None
23+
2224
if len(zmq_servers) > 1:
2325
raise ValueError(
2426
"Only one ZMQServer or RPCServer instance to be run at a time, "
2527
+ "please add all your things to one instance"
2628
)
27-
28-
rpc_server = None
29-
if not any(isinstance(server, (RPCServer, ZMQServer)) for server in servers):
29+
elif len(zmq_servers) == 1:
30+
rpc_server = zmq_servers[0]
31+
else:
3032
rpc_server = RPCServer(
3133
id=f"rpc-broker-{uuid.uuid4().hex[:8]}",
3234
things=things,
3335
context=global_config.zmq_context(),
3436
logger=global_config.logger(),
3537
)
36-
else:
37-
rpc_server = zmq_servers[0]
3838

3939
threading.Thread(target=rpc_server.run).start()
4040

@@ -43,12 +43,6 @@ def run(*servers: BaseProtocolServer) -> None:
4343
for server in servers:
4444
if server == rpc_server:
4545
continue
46-
for thing in server.things:
47-
server.add_thing_instance_through_broker(
48-
server_id=rpc_server.id,
49-
thing_id=thing.id,
50-
access_point="INPROC",
51-
)
5246
futures.append(server.start())
5347

5448
loop.run_until_complete(asyncio.gather(*futures))

0 commit comments

Comments
 (0)