Format with black

Formatting code with black
- pipenv update
This commit is contained in:
Brian Martin 2019-05-30 06:55:15 -04:00
parent 401af5652f
commit c3098e03e4
8 changed files with 741 additions and 663 deletions

View file

@ -6,7 +6,8 @@ import sys, socket
import time
import platform
import os
#os.environ['PYTHONASYNCIODEBUG'] = '1' # Uncomment to enable ASYNCIODEBUG
# os.environ['PYTHONASYNCIODEBUG'] = '1' # Uncomment to enable ASYNCIODEBUG
import asyncio
@ -15,41 +16,39 @@ async def main():
loop = asyncio.get_event_loop()
except:
loop = asyncio.new_event_loop()
args = sys.argv
listen_host = ""
if len(args) > 0:
if "--debug" in args:
logging.basicConfig(
level=logging.DEBUG,
format="[%(asctime)s] :: %(levelname)s :: %(name)s :: %(module)s :: %(funcName)s :: %(lineno)d :: %(message)s",
)
loop.set_debug(True) # Set asyncio loop to debug
#logging.getLogger("asyncio").setLevel(logging.DEBUG) # Show debug asyncio logs (disabled in init, uncomment for debugging asyncio)
loop.set_debug(True) # Set asyncio loop to debug
# logging.getLogger("asyncio").setLevel(logging.DEBUG) # Show debug asyncio logs (disabled in init, uncomment for debugging asyncio)
else:
logging.basicConfig(
level=logging.INFO,
format="[%(asctime)s] :: %(levelname)s :: %(name)s :: %(message)s",
)
if "--listen" in args:
if "--listen" in args:
listen_host = args[args.index("--listen") + 1]
if listen_host == "":
if platform.system() == "Darwin": # If a Mac, use 0.0.0.0 for listening
listen_host = "0.0.0.0"
else:
listen_host = socket.gethostbyname(socket.gethostname())
listen_host = socket.gethostbyname(socket.gethostname())
conf_address_443 = (listen_host, 443)
conf_address_8007 = (listen_host, 8007)
xmpp_address = (listen_host, 5223)
mqtt_address = (listen_host, 8883)
xmpp_server = bumper.XMPPServer(
xmpp_address
)
xmpp_server = bumper.XMPPServer(xmpp_address)
mqtt_server = bumper.MQTTServer(mqtt_address)
mqtt_helperbot = bumper.MQTTHelperBot(mqtt_address)
conf_server = bumper.ConfServer(
@ -62,23 +61,23 @@ async def main():
try:
# Start web servers
conf_server.confserver_app()
conf_server.confserver_app()
asyncio.create_task(conf_server.start_server())
conf_server_2.confserver_app()
asyncio.create_task(conf_server_2.start_server())
# Start MQTT Server
asyncio.create_task(mqtt_server.broker_coro())
# Start MQTT Helperbot
asyncio.create_task(mqtt_helperbot.start_helper_bot())
# Start XMPP Server
asyncio.create_task(xmpp_server.start_async_server())
maintain = asyncio.create_task(maintenance_tasks())
await maintain #Keeps the loop running until this exits
await maintain # Keeps the loop running until this exits
finally:
# Cleanup and close tasks/loop
@ -86,19 +85,19 @@ async def main():
task.cancel()
loop.close()
async def maintenance_tasks():
while True:
await asyncio.sleep(30) # Sleep 30 seconds
await asyncio.sleep(30) # Sleep 30 seconds
bumper.revoke_expired_tokens()
if __name__ == "__main__":
try:
asyncio.run(main())
except KeyboardInterrupt:
bumper.bumperlog.info("Keyboard Interrupt!")
pass
finally:
bumper.bumperlog.info("Bumper Exiting!")