Compare commits

..

No commits in common. "b0ae19db23a2e1f8f86e3115cc06e206f401feb6" and "62355023fa995f58ec6f1f10ef2e074e0e7579f1" have entirely different histories.

8 changed files with 55 additions and 134 deletions

1
.gitignore vendored
View File

@ -2,4 +2,3 @@ venv
.idea .idea
/test/clients.json /test/clients.json
*.pyc *.pyc
*.egg-info

View File

@ -1,3 +0,0 @@
[build-system]
requires = ["setuptools", "wheel"]
build-backend = "setuptools.build_meta"

View File

@ -1,19 +0,0 @@
[metadata]
name = torchsub
version = 0.0.1
author = Benjamin Dweck
author_email = bjdweck@gmail.com
url = http://git.rudefox.io/bj/torch-subscriber-simple
classifiers =
Programming Language :: Python :: 3
License :: OSI Approved :: MIT License
[options]
packages = find:
install_requires = paho-mqtt~=1.5.1
[options.entry_points]
console_scripts = torch-sub=torchsub.torch_sub:main
[options.packages.find]
exclude=test

View File

@ -1,3 +1,16 @@
import setuptools from setuptools import setup
setuptools.setup() setup(
name='torch-subscriber-simple',
version='0.0.1',
packages=['torch_sub', 'torch_sub.test'],
url='http://git.rudefox.io/bj/torch-subscriber-simple',
license='MIT',
author='Benjamin Dweck',
author_email='bjdweck@gmail.com',
description='',
classifiers=[
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
],
)

View File

@ -10,7 +10,7 @@ from unittest.case import TestCase
import paho.mqtt.client as mqtt import paho.mqtt.client as mqtt
from torchsub import torch_sub from torch_sub import torch_sub
broker_hostname = "mqtt.example.com" broker_hostname = "mqtt.example.com"
broker_port = 8883 broker_port = 8883

39
torch_sub/torch_sub.py Normal file
View File

@ -0,0 +1,39 @@
import json
import os
import threading
import paho.mqtt.subscribe as mqtt
database_filename = "clients.json"
database_lock = threading.Lock()
# noinspection PyUnusedLocal
def update_client_record(client, userdata, message):
database_lock.acquire()
if not os.path.exists(database_filename):
with open(database_filename, 'w') as database_blank:
json.dump({}, database_blank)
with open(database_filename, 'r') as infile:
database = json.load(infile)
payload = message.payload.decode('utf-8')
response = json.loads(payload)
database[response['clientId']] = response
with open(database_filename, 'w') as outfile:
json.dump(database, outfile)
database_lock.release()
def subscribe(broker_hostname, broker_port, topic="torch", tls=None, auth=None):
mqtt.callback(update_client_record,
topic,
hostname=broker_hostname,
port=broker_port,
tls=tls,
auth=auth)

View File

@ -1,108 +0,0 @@
import argparse
import configparser
import json
import os
import sys
import threading
import paho.mqtt.subscribe as mqtt
database_filename = "clients.json"
database_lock = threading.Lock()
# noinspection PyUnusedLocal
def update_client_record(client, userdata, message):
database_lock.acquire()
if not os.path.exists(database_filename):
with open(database_filename, 'w') as database_blank:
json.dump({}, database_blank)
with open(database_filename, 'r') as infile:
database = json.load(infile)
payload = message.payload.decode('utf-8')
response = json.loads(payload)
database[response['clientId']] = response
with open(database_filename, 'w') as outfile:
json.dump(database, outfile)
database_lock.release()
def subscribe(broker_hostname, broker_port, topic="torch", tls=None):
mqtt.callback(update_client_record,
topic,
hostname=broker_hostname,
port=broker_port,
tls=tls)
class Config:
def __init__(self):
self.broker_hostname = None
self.broker_port = None
self.topic = None
self.tls = None
parser = self.do_cli_argument_parsing()
(config_path, config_filename) = self.get_config_path(parser.parse_args())
print("Using torch configuration path: " + config_path)
self.read_configuration_file(config_path, config_filename)
@staticmethod
def do_cli_argument_parsing():
parser = argparse.ArgumentParser(description='Simple Torch Flat-file Database Subscriber')
parser.add_argument('--config-dir',
nargs='?',
dest='configPath',
default='/etc/torch',
help='configuration directory (default: /etc/torch)')
parser.add_argument('--config-filename',
nargs='?',
dest='configFilename',
default='torch-sub.conf',
help='configuration filename (default: torch-sub.conf)')
return parser
@staticmethod
def get_config_path(args):
config_path = args.configPath
if "TORCH_CONFIG_DIR" in os.environ:
config_path = os.environ.get("TORCH_CONFIG_DIR")
if not config_path.endswith("/"):
config_path = config_path + "/"
return config_path, args.configFilename
def read_configuration_file(self, config_dir, config_filename):
config_file_path = os.path.join(config_dir, config_filename)
if not os.path.exists(config_file_path):
print("Unable to locate config file at '%s'" % config_file_path)
sys.exit(1)
config = configparser.ConfigParser()
config.read(config_file_path)
mqtt_config = config['mqtt']
self.broker_hostname = mqtt_config.get('BrokerHost', fallback="localhost")
self.broker_port = mqtt_config.getint('BrokerPort', fallback=1883)
self.topic = mqtt_config.get('Topic', fallback="torch/+/onion_url")
require_certificate = mqtt_config.getboolean('RequireCertificate', fallback=False)
ca_file = config_dir + mqtt_config.get('CaFile', "")
cert_file = config_dir + mqtt_config.get('CertFile', "")
key_file = config_dir + mqtt_config.get('KeyFile', "")
self.tls = None
if require_certificate:
self.tls = {
'ca_certs': ca_file,
'certfile': cert_file,
'keyfile': key_file
}
def main():
config = Config()
subscribe(config.broker_hostname,
config.broker_port,
config.topic,
config.tls)