Launches web server to serve the client database via http using configurable port
This commit is contained in:
parent
901b3ca960
commit
a67b3ef441
|
@ -1,2 +1,9 @@
|
||||||
paho-mqtt~=1.5.1
|
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
|
11
setup.cfg
11
setup.cfg
|
@ -10,7 +10,16 @@ classifiers =
|
||||||
|
|
||||||
[options]
|
[options]
|
||||||
packages = find:
|
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]
|
[options.entry_points]
|
||||||
console_scripts = torch-sub=torchsub.torch_sub:main
|
console_scripts = torch-sub=torchsub.torch_sub:main
|
||||||
|
|
|
@ -3,7 +3,13 @@
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
[mqtt]
|
[mqtt]
|
||||||
Topic=torch/+/wake #Required
|
#Topic is required
|
||||||
|
Topic=torch/+/wake
|
||||||
|
|
||||||
[database]
|
[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
|
|
@ -7,6 +7,8 @@ import threading
|
||||||
|
|
||||||
import paho.mqtt.subscribe as mqtt
|
import paho.mqtt.subscribe as mqtt
|
||||||
|
|
||||||
|
from torchsub import torch_sub_webserver
|
||||||
|
|
||||||
database_filename = "clients.json"
|
database_filename = "clients.json"
|
||||||
database_lock = threading.Lock()
|
database_lock = threading.Lock()
|
||||||
|
|
||||||
|
@ -44,6 +46,7 @@ class Config:
|
||||||
self.topic = None
|
self.topic = None
|
||||||
self.tls = None
|
self.tls = None
|
||||||
self.database_file = database_filename
|
self.database_file = database_filename
|
||||||
|
self.web_port = 8080
|
||||||
parser = self.do_cli_argument_parsing()
|
parser = self.do_cli_argument_parsing()
|
||||||
(config_path, config_filename) = self.get_config_path(parser.parse_args())
|
(config_path, config_filename) = self.get_config_path(parser.parse_args())
|
||||||
print("Using torch configuration path: " + config_path)
|
print("Using torch configuration path: " + config_path)
|
||||||
|
@ -97,6 +100,8 @@ class Config:
|
||||||
}
|
}
|
||||||
if config.has_section('database'):
|
if config.has_section('database'):
|
||||||
self.database_file = config['database'].get('Filename', fallback=database_filename)
|
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():
|
def main():
|
||||||
|
@ -109,6 +114,10 @@ def main():
|
||||||
with open(database_filename, 'w') as database_blank:
|
with open(database_filename, 'w') as database_blank:
|
||||||
json.dump({}, 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,
|
subscribe(config.broker_hostname,
|
||||||
config.broker_port,
|
config.broker_port,
|
||||||
config.topic,
|
config.topic,
|
||||||
|
|
15
torchsub/torch_sub_webserver.py
Normal file
15
torchsub/torch_sub_webserver.py
Normal 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…
Reference in New Issue
Block a user