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

cleaning up formatting

Browse source 
cleaning up formatting
This commit is contained in:
Brian Martin 2019-02-20 21:17:35 -05:00
parent 0a5d93b099
commit e17a0cb30b
5 changed files with 268 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bumper/confserver.py
View file

@ -100,8 +100,6 @@ class ConfServer():
#Direct register from app:
#/{apiversion}/private/{country}/{language}/{devid}/{apptype}/{appversion}/{devtype}/{aid}/user/directRegister
runner = web.AppRunner(app)
await runner.setup()

10
bumper/mqttserver.py
View file

@ -312,11 +312,11 @@ class BumperMQTTServer_Plugin:
else:
authenticated = False
except KeyError:
self.context.logger.warning("Session information not available")
except Exception as e:
mqttserverlog.exception('{}'.format(e))
authenticated = False
return authenticated
return authenticated
async def on_broker_client_connected(self, client_id):
try:
@ -328,7 +328,7 @@ class BumperMQTTServer_Plugin:
for bot in bumper_bots:
if didsplit[0] == bot.did:
bot.mqtt_connection = True
#mqttserverlog.info("bot connected {}".format(bot.did))
mqttserverlog.debug("bot connected {}".format(bot.did))
self.bumper_config['bumper_bots'].set(bumper_bots)
for client in bumper_clients:
@ -351,7 +351,7 @@ class BumperMQTTServer_Plugin:
for bot in bumper_bots:
if didsplit[0] == bot.did:
bot.mqtt_connection = False
#mqttserverlog.info("bot disconnected {}".format(bot.did))
mqttserverlog.debug("bot disconnected {}".format(bot.did))
self.bumper_config['bumper_bots'].set(bumper_bots)
for client in bumper_clients:

3
bumper/xmppserver.py
View file

@ -536,7 +536,8 @@ class Client(threading.Thread):
if self.state == self.CONNECT or self.state == self.INIT:
self._handle_connect(data)
else:
xmppserverlog.error('xml parse error - {} - {}'.format(data.decode('utf-8'), e))
if not (data.decode('utf-8') == "" or data.decode('utf-8') == " "):
xmppserverlog.error('xml parse error - {} - {}'.format(data.decode('utf-8'), e))
elif "not well-formed (invalid token)" in e.msg:
#If a lone </stream:stream> - client is signalling end of session/disconnect