modified: srcdev/api.py

modified:   srcdev/moj_licznik.py
	modified:   srcdev/run.py
This commit is contained in:
TC
2023-11-04 13:08:22 +01:00
parent a6e7c6d773
commit 9b7255c291
4 changed files with 6 additions and 5 deletions

Binary file not shown.

View File

@@ -210,7 +210,8 @@ def charts():
query = query.where(MainChartTable.mp == mp) query = query.where(MainChartTable.mp == mp)
if meter_type_url: if meter_type_url:
query = query.where(MainChartTable.meter_type_url == meter_type_url) meter_type = urllib.parse.unquote(meter_type_url)
query = query.where(MainChartTable.meter_type == meter_type)
if zone: if zone:
query = query.where(MainChartTable.zone == zone) query = query.where(MainChartTable.zone == zone)

View File

@@ -357,7 +357,7 @@ class MojLicznik:
def save_main_charts(self, mp, vals, m_type): def save_main_charts(self, mp, vals, m_type):
for val in vals: for val in vals:
#try: try:
logger.debug(f"save_main_charts: mp: {mp}, val: {val}, meter_type: {m_type}") logger.debug(f"save_main_charts: mp: {mp}, val: {val}, meter_type: {m_type}")
z = val["zones"] z = val["zones"]
if z[0]: if z[0]:
@@ -409,8 +409,8 @@ class MojLicznik:
cplt=val["cplt"] cplt=val["cplt"]
) )
#except: except Exception as e:
# pass logging.error(f"Wystąpił błąd: {str(e)}")
return None return None

View File

@@ -36,7 +36,7 @@ def periodic_task():
startup_task_completed.wait() startup_task_completed.wait()
while True: while True:
try: try:
waiting_seconds = 600 waiting_seconds = 1200
logger.info(f"Oczekiwanie...") logger.info(f"Oczekiwanie...")
logger.debug(f"Czekam {waiting_seconds} sekund.") logger.debug(f"Czekam {waiting_seconds} sekund.")
time.sleep(waiting_seconds) time.sleep(waiting_seconds)