From 4d1b272f13c01acef360a261f4c0a96945adbbb3 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 17 Jan 2021 01:14:37 +0100
Subject: [PATCH] re-enable DiscoveryService
---
src/StorageLeaf.py | 6 ++++++
src/logic/DiscoveryService.py | 2 +-
src/version.json | 6 +++---
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/StorageLeaf.py b/src/StorageLeaf.py
index 45991e8..e5493fc 100644
--- a/src/StorageLeaf.py
+++ b/src/StorageLeaf.py
@@ -8,6 +8,7 @@ from starlette.responses import RedirectResponse, FileResponse
from Settings import SETTINGS
from logic import Constants
+from logic.DiscoveryService import DiscoveryService
from logic.database import Models, Schemas
from logic.database.Database import engine
from logic.routers import DeviceRouter
@@ -51,6 +52,11 @@ app.include_router(DeviceRouter.router)
app.include_router(SensorRouter.router)
app.include_router(MeasurementRouter.router)
+discoverySettings = SETTINGS['discovery']
+discoverySettings['apiPort'] = SETTINGS['server']['port']
+discoveryService = DiscoveryService(**discoverySettings)
+discoveryService.start()
+
if __name__ == '__main__':
serverSettings = SETTINGS['server']
protocol = 'https' if serverSettings['useSSL'] else 'http'
diff --git a/src/logic/DiscoveryService.py b/src/logic/DiscoveryService.py
index 9e7be34..194c13f 100644
--- a/src/logic/DiscoveryService.py
+++ b/src/logic/DiscoveryService.py
@@ -18,7 +18,7 @@ class DiscoveryService:
self._shouldStop = False
def start(self):
- LOGGER.debug("Start discovery thread")
+ LOGGER.debug(f'Start discovery thread (listening on {self._discoveryPort}, responding on {self._responsePort})')
x = threading.Thread(target=self.__loop)
x.start()
diff --git a/src/version.json b/src/version.json
index 9e300a2..634ac2e 100644
--- a/src/version.json
+++ b/src/version.json
@@ -1,7 +1,7 @@
{
"version": {
- "name": "v2.0.1",
- "code": 9,
- "date": "16.01.21"
+ "name": "v2.0.2",
+ "code": 10,
+ "date": "17.01.21"
}
}
\ No newline at end of file
--
GitLab