Browse Source

Launches web server to serve the client database via http using configurable port

master
B.J. Dweck 11 months ago
parent
commit
a67b3ef441
5 changed files with 50 additions and 4 deletions
  1. +8
    -1
      requirements.txt
  2. +10
    -1
      setup.cfg
  3. +8
    -2
      torch-sub.conf
  4. +9
    -0
      torchsub/torch_sub.py
  5. +15
    -0
      torchsub/torch_sub_webserver.py

+ 8
- 1
requirements.txt View File

@ -1,2 +1,9 @@
paho-mqtt~=1.5.1
setuptools~=50.3.1
setuptools~=50.3.1
pip~=20.2.3
Jinja2~=2.11.2
Werkzeug~=1.0.1
itsdangerous~=1.1.0
click~=7.1.2
MarkupSafe~=1.1.1
Flask~=1.1.2

+ 10
- 1
setup.cfg View File

@ -10,7 +10,16 @@ classifiers =
[options]
packages = find:
install_requires = paho-mqtt~=1.5.1
install_requires =
paho-mqtt~=1.5.1
setuptools~=50.3.1
pip~=20.2.3
Jinja2~=2.11.2
Werkzeug~=1.0.1
itsdangerous~=1.1.0
click~=7.1.2
MarkupSafe~=1.1.1
Flask~=1.1.2
[options.entry_points]
console_scripts = torch-sub=torchsub.torch_sub:main

+ 8
- 2
torch-sub.conf View File

@ -3,7 +3,13 @@
##############################################################################
[mqtt]
Topic=torch/+/wake #Required
#Topic is required
Topic=torch/+/wake
[database]
Filename=torch_clients.json #Optional; Default: clients.json
#Filename is optional and defaults to 'clients.json'
Filename=torch_clients.json
[web]
#Port is optional and defaults to 8080
Port=3434

+ 9
- 0
torchsub/torch_sub.py View File

@ -7,6 +7,8 @@ import threading
import paho.mqtt.subscribe as mqtt
from torchsub import torch_sub_webserver
database_filename = "clients.json"
database_lock = threading.Lock()
@ -44,6 +46,7 @@ class Config:
self.topic = None
self.tls = None
self.database_file = database_filename
self.web_port = 8080
parser = self.do_cli_argument_parsing()
(config_path, config_filename) = self.get_config_path(parser.parse_args())
print("Using torch configuration path: " + config_path)
@ -97,6 +100,8 @@ class Config:
}
if config.has_section('database'):
self.database_file = config['database'].get('Filename', fallback=database_filename)
if config.has_section('web'):
self.web_port = config['web'].getint('Port', fallback=self.web_port)
def main():
@ -109,6 +114,10 @@ def main():
with open(database_filename, 'w') as database_blank:
json.dump({}, database_blank)
threading.Thread(target=torch_sub_webserver.app.run,
args=("localhost", config.web_port),
daemon=True).start()
subscribe(config.broker_hostname,
config.broker_port,
config.topic,

+ 15
- 0
torchsub/torch_sub_webserver.py View File

@ -0,0 +1,15 @@
from flask import Flask
from torchsub import torch_sub
app = Flask(__name__)
@app.route('/clients', methods=['GET'])
def clients():
with open(torch_sub.database_filename, 'r') as database:
return app.response_class(
response=database.read(),
status=200,
mimetype='application/json'
)

Loading…
Cancel
Save