bj/torch-subscriber-simple
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Variable rename

Browse Source
This commit is contained in:
B.J. Dweck 2020-10-16 11:48:12 +02:00
parent b13fbf536f
commit 62355023fa
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/test_integration.py
View File

@ -55,13 +55,13 @@ def publish(client_id, onion_hostname, use_tls=True):
class GivenBroker(TestCase): class GivenBroker(TestCase):
def setUp(self) -> None: def setUp(self) -> None:
if os.path.exists(torch_sub.database_file): if os.path.exists(torch_sub.database_filename):
os.remove(torch_sub.database_file) os.remove(torch_sub.database_filename)
def tearDown(self) -> None: def tearDown(self) -> None:
os.system("docker container stop mosquitto") os.system("docker container stop mosquitto")
if os.path.exists(torch_sub.database_file): if os.path.exists(torch_sub.database_filename):
os.remove(torch_sub.database_file) os.remove(torch_sub.database_filename)
@staticmethod @staticmethod
def run_broker(tls): def run_broker(tls):
@ -95,7 +95,7 @@ class GivenBroker(TestCase):
@staticmethod @staticmethod
def loadDatabase(): def loadDatabase():
with open(torch_sub.database_file, "r") as database_file: with open(torch_sub.database_filename, "r") as database_file:
return json.load(database_file) return json.load(database_file)

10
torch_sub/torch_sub.py
View File

@ -4,7 +4,7 @@ import threading
import paho.mqtt.subscribe as mqtt import paho.mqtt.subscribe as mqtt
database_file = "clients.json" database_filename = "clients.json"
database_lock = threading.Lock() database_lock = threading.Lock()
# noinspection PyUnusedLocal # noinspection PyUnusedLocal
@ -12,11 +12,11 @@ def update_client_record(client, userdata, message):
database_lock.acquire() database_lock.acquire()
if not os.path.exists(database_file): if not os.path.exists(database_filename):
with open(database_file, 'w') as database_blank: with open(database_filename, 'w') as database_blank:
json.dump({}, database_blank) json.dump({}, database_blank)
with open(database_file, 'r') as infile: with open(database_filename, 'r') as infile:
database = json.load(infile) database = json.load(infile)
payload = message.payload.decode('utf-8') payload = message.payload.decode('utf-8')
@ -24,7 +24,7 @@ def update_client_record(client, userdata, message):
database[response['clientId']] = response database[response['clientId']] = response
with open(database_file, 'w') as outfile: with open(database_filename, 'w') as outfile:
json.dump(database, outfile) json.dump(database, outfile)
database_lock.release() database_lock.release()