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

Remove vars

Browse source 
Start removal
This commit is contained in:
Brian Martin 2019-05-12 15:31:52 -04:00
parent 2683421c34
commit d6816a02ec
5 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bumper/__init__.py
View file

@ -5,7 +5,6 @@ from .mqttserver import MQTTServer
from .mqttserver import MQTTHelperBot from .mqttserver import MQTTHelperBot
from .xmppserver import XMPPServer from .xmppserver import XMPPServer
import asyncio import asyncio
import contextvars
import time import time
from datetime import datetime, timedelta from datetime import datetime, timedelta
import platform import platform
@ -17,10 +16,6 @@ from tinydb import TinyDB, Query
import json import json
from tinydb.storages import MemoryStorage from tinydb.storages import MemoryStorage
bumper_users_var = contextvars.ContextVar("bumper_users", default=[])
bumper_clients_var = contextvars.ContextVar("bumper_clients", default=[])
bumper_bots_var = contextvars.ContextVar("bumper_bots", default=[])
ca_cert = "./certs/CA/cacert.pem" ca_cert = "./certs/CA/cacert.pem"
server_cert = "./certs/cert.pem" server_cert = "./certs/cert.pem"
server_key = "./certs/key.pem" server_key = "./certs/key.pem"

1
bumper/confserver.py
View file

@ -8,7 +8,6 @@ import bumper
import time import time
from datetime import datetime, timedelta from datetime import datetime, timedelta
import asyncio import asyncio
import contextvars
from aiohttp import web from aiohttp import web
import uuid import uuid

8
bumper/mqttserver.py
View file

@ -8,7 +8,7 @@ from hbmqtt.broker import Broker
from hbmqtt.client import MQTTClient from hbmqtt.client import MQTTClient
from hbmqtt.mqtt.constants import QOS_0, QOS_1, QOS_2 from hbmqtt.mqtt.constants import QOS_0, QOS_1, QOS_2
import pkg_resources import pkg_resources
import contextvars #import contextvars
import time import time
from threading import Thread from threading import Thread
import ssl import ssl
@ -40,7 +40,7 @@ class MQTTHelperBot:
): ):
self.address = address self.address = address
self.client_id = "helper1@bumper/helper1" self.client_id = "helper1@bumper/helper1"
self.command_responses = contextvars.ContextVar("command_responses", default=[]) self.command_responses = [] # = contextvars.ContextVar("command_responses", default=[])
self.helperthread = None self.helperthread = None
def run(self, run_async=False): def run(self, run_async=False):
@ -99,7 +99,7 @@ class MQTTHelperBot:
message = await self.Client.deliver_message() message = await self.Client.deliver_message()
# helperbotlog.debug("HelperBot MQTT Received Message on Topic: {} - Message: {}".format(message.topic, str(message.payload.decode("utf-8")))) # helperbotlog.debug("HelperBot MQTT Received Message on Topic: {} - Message: {}".format(message.topic, str(message.payload.decode("utf-8"))))
cresp = self.command_responses.get() cresp = self.command_responses #.get()
if str(message.topic).split("/")[6] == "helper1": if str(message.topic).split("/")[6] == "helper1":
cresp.append( cresp.append(
@ -119,7 +119,7 @@ class MQTTHelperBot:
# helperbotlog.debug("Pruning Message Time: {}, MsgTime: {}, MsgTime+60: {}".format(time.time(), msg['time'], expire_time)) # helperbotlog.debug("Pruning Message Time: {}, MsgTime: {}, MsgTime+60: {}".format(time.time(), msg['time'], expire_time))
cresp.remove(msg) cresp.remove(msg)
self.command_responses.set(cresp) self.command_responses = cresp #.set(cresp)
# helperbotlog.debug("MQTT Command Response List Count: %s" %len(cresp)) # helperbotlog.debug("MQTT Command Response List Count: %s" %len(cresp))
except Exception as e: except Exception as e:

1
bumper/xmppserver.py
View file

@ -4,7 +4,6 @@ from threading import Thread
import sys, socket, threading, re, time, logging, uuid, xml.etree.ElementTree as ET import sys, socket, threading, re, time, logging, uuid, xml.etree.ElementTree as ET
import base64 import base64
import ssl import ssl
import contextvars
import bumper import bumper
import asyncio import asyncio

8
start_bumper.py
View file

@ -51,14 +51,6 @@ def main():
conf_address_8007, usessl=False, helperbot=mqtt_helperbot conf_address_8007, usessl=False, helperbot=mqtt_helperbot
) )
# add user
# users = bumper.bumper_users_var.get()
# user1 = bumper.BumperUser('user1')
# user1.add_device('devid')
# user1.add_bot('bot_did')
# users.append(user1)
# bumper.bumper_users_var.set(users)
try: try:
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
except: except: