mia/bumper
1
0
Fork 0
Code Issues 47 Pull requests 11 Projects Releases Packages Wiki Activity Actions

confserver revamp #88

Merged
bmartin5692 merged 12 commits from wip-confserver-jinja2 into master 2020-01-05 02:46:34 +01:00
Conversation 1 Commits 12 Files changed 27 +6 -4
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 80c412afd1 - Show all commits

8
bumper/confserver.py
View file

@ -341,17 +341,18 @@ class ConfServer:
if sessobj.session.transitions.state == "connected": if sessobj.session.transitions.state == "connected":
await sessobj.writer.close() await sessobj.writer.close()
#await bumper.mqtt_server.broker.shutdown()
aloop = asyncio.get_event_loop() aloop = asyncio.get_event_loop()
aloop.call_later( aloop.call_later(
0.1, lambda: asyncio.create_task(bumper.mqtt_server.broker.shutdown()) 0.1, lambda: asyncio.create_task(bumper.mqtt_server.broker.shutdown())
) # In .1 seconds shutdown broker ) # In .1 seconds shutdown broker
aloop = asyncio.get_event_loop() aloop = asyncio.get_event_loop()
aloop.call_later( aloop.call_later(
1.5, lambda: asyncio.create_task(bumper.mqtt_server.broker_coro()) 1.5, lambda: asyncio.create_task(bumper.mqtt_server.broker_coro())
) # In 1.5 seconds start broker ) # In 1.5 seconds start broker
async def restart_XMPP(self): async def restart_XMPP(self):
bumper.xmpp_server.disconnect() bumper.xmpp_server.disconnect()
await bumper.xmpp_server.start_async_server() await bumper.xmpp_server.start_async_server()
@ -363,11 +364,12 @@ class ConfServer:
await self.restart_Helper() await self.restart_Helper()
return web.json_response({"status": "complete"}) return web.json_response({"status": "complete"})
elif service == "MQTTServer": elif service == "MQTTServer":
await self.restart_MQTT() asyncio.create_task(self.restart_MQTT())
aloop = asyncio.get_event_loop() aloop = asyncio.get_event_loop()
aloop.call_later( aloop.call_later(
5, lambda: asyncio.create_task(self.restart_Helper()) 5, lambda: asyncio.create_task(self.restart_Helper())
) # In 5 seconds restart Helperbot ) # In 5 seconds restart Helperbot
return web.json_response({"status": "complete"}) return web.json_response({"status": "complete"})
elif service == "XMPPServer": elif service == "XMPPServer":
await self.restart_XMPP() await self.restart_XMPP()