mirror of
https://git.ianrenton.com/ian/spothole.git
synced 2026-08-06 02:21:42 +00:00
Refactor of caching & data storage part 2 #118
This commit is contained in:
+3
-7
@@ -13,7 +13,6 @@ from core.status_reporter import StatusReporter
|
||||
from server.webserver import WebServer
|
||||
|
||||
# Globals
|
||||
data_store = DATA_STORE
|
||||
web_server = None
|
||||
spot_providers = []
|
||||
alert_providers = []
|
||||
@@ -39,7 +38,7 @@ def shutdown(_signum=None, _frame=None):
|
||||
for scp in solar_condition_providers:
|
||||
if scp.enabled:
|
||||
scp.stop()
|
||||
data_store.close()
|
||||
DATA_STORE.close()
|
||||
os._exit(0)
|
||||
|
||||
|
||||
@@ -90,13 +89,12 @@ if __name__ == '__main__':
|
||||
lookup_helper.start()
|
||||
|
||||
# Set up web server
|
||||
web_server = WebServer(data_store=data_store)
|
||||
web_server = WebServer()
|
||||
|
||||
# Fetch, set up and start spot providers
|
||||
for entry in config["spot-providers"]:
|
||||
spot_providers.append(get_spot_provider_from_config(entry))
|
||||
for p in spot_providers:
|
||||
p.setup(spots=data_store.spots, web_server=web_server)
|
||||
if p.enabled:
|
||||
p.start()
|
||||
|
||||
@@ -104,7 +102,6 @@ if __name__ == '__main__':
|
||||
for entry in config["alert-providers"]:
|
||||
alert_providers.append(get_alert_provider_from_config(entry))
|
||||
for p in alert_providers:
|
||||
p.setup(alerts=data_store.alerts, web_server=web_server)
|
||||
if p.enabled:
|
||||
p.start()
|
||||
|
||||
@@ -112,12 +109,11 @@ if __name__ == '__main__':
|
||||
for entry in config.get("solar-condition-providers", []):
|
||||
solar_condition_providers.append(get_solar_conditions_provider_from_config(entry))
|
||||
for p in solar_condition_providers:
|
||||
p.setup(solar_conditions=data_store.solar_conditions)
|
||||
if p.enabled:
|
||||
p.start()
|
||||
|
||||
# Set up status reporter
|
||||
status_reporter = StatusReporter(data_store=data_store, web_server=web_server, spot_providers=spot_providers,
|
||||
status_reporter = StatusReporter(web_server=web_server, spot_providers=spot_providers,
|
||||
alert_providers=alert_providers,
|
||||
solar_condition_providers=solar_condition_providers, run_interval=5)
|
||||
status_reporter.start()
|
||||
|
||||
Reference in New Issue
Block a user