VladislavOstapov/ospaz-site
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Добавил еще одно устройство в проект: HART модем, получающий накопленный расход от расходометра.

Browse Source
This commit is contained in:
VladislavOstapov
2024-02-21 15:44:55 +03:00
parent 4da1ce477e
commit 0195373cc4
7 changed files with 87 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
logs_service/apps.py
View File

@@ -11,9 +11,11 @@ class LogsServiceConfig(AppConfig):
mb_tank_service = None
mb_pump_service = None
mb_hart_service = None
mb_tank_service_enable = True
mb_pump_service_enable = True
mb_tank_service_enable = False
mb_pump_service_enable = False
mb_hart_service_enable = False
def ready(self):
# защита от двойного запуска
@@ -21,13 +23,16 @@ class LogsServiceConfig(AppConfig):
return
print(f"Running logger service in process with pid={os.getpid()}")
from .services import MbTankService, MbPumpService
from .services import MbTankService, MbPumpService, MbHartService
# включение/выключение сервисов
mb_tank_service_enable = os.getenv('ENABLE_MB_TANK_SERVICE', '1')
LogsServiceConfig.mb_tank_service_enable = int(mb_tank_service_enable) != 0
_en = os.getenv('ENABLE_MB_TANK_SERVICE', '1')
LogsServiceConfig.mb_tank_service_enable = int(_en) != 0
mb_pump_service_enable = os.getenv('ENABLE_MB_PUMP_SERVICE', '1')
LogsServiceConfig.mb_pump_service_enable = int(mb_pump_service_enable) != 0
_en = os.getenv('ENABLE_MB_PUMP_SERVICE', '1')
LogsServiceConfig.mb_pump_service_enable = int(_en) != 0
_en = os.getenv('ENABLE_MB_HART_SERVICE', '1')
LogsServiceConfig.mb_hart_service_enable = int(_en) != 0
save_days = int(os.getenv('LOGGER_SAVE_DAYS'))
@@ -44,6 +49,12 @@ class LogsServiceConfig(AppConfig):
scan_rate=int(os.getenv('MB_PUMP_SCAN_RATE_MS')),
save_days=save_days)
if LogsServiceConfig.mb_hart_service_enable:
LogsServiceConfig.mb_hart_service = MbHartService(ip_addr=os.getenv('MB_HART_ADDRESS'),
port=int(os.getenv('MB_HART_PORT')),
scan_rate=int(os.getenv('MB_HART_SCAN_RATE_MS')),
save_days=save_days)
# запуск сервисов
if LogsServiceConfig.mb_tank_service_enable:
if DEBUG:
@@ -55,6 +66,11 @@ class LogsServiceConfig(AppConfig):
print('Creating service MbPumpService...')
LogsServiceConfig.mb_pump_service.start()
if LogsServiceConfig.mb_hart_service_enable:
if DEBUG:
print('Creating service MbHartService...')
LogsServiceConfig.mb_hart_service.start()
return True