From 8621888d8156b0dbec134fb0de6788c591802a59 Mon Sep 17 00:00:00 2001 From: phylax2020 Date: Fri, 15 Jul 2022 21:47:23 +0200 Subject: [PATCH] Allow changing log file size and log file backup count in settings. Default for log file size is now 130000 bytes (was 1MB). Dashboard with charts can be blocked if accumulated size of log file data exceeds some megabytes. Also chart refresh rate should be greater than some 10 seconds so that chart plots can not block the user interface. In functions get_data (for dashboard charts) and get_data2 (for chart in analytics) the pandas resample function is reactivated respectively added to further reduce the amount of data to be transferred to the clients. In function log_data max_bytes and backup_count must be converted to int, when these settings are changed in the settings dialog. --- cbpi/config/config.json | 16 +++++++++++++++- cbpi/controller/log_file_controller.py | 15 +++++++++------ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/cbpi/config/config.json b/cbpi/config/config.json index 56f98c5..cdb9b15 100644 --- a/cbpi/config/config.json +++ b/cbpi/config/config.json @@ -144,5 +144,19 @@ "options": null, "type": "step", "value": "NotificationStep" - } + }, + "SENSOR_LOG_BACKUP_COUNT": { + "description": "Max. number of backup logs", + "name": "SENSOR_LOG_BACKUP_COUNT", + "options": null, + "type": "number", + "value": 3 + }, + "SENSOR_LOG_MAX_BYTES": { + "description": "Max. number of bytes in sensor logs", + "name": "SENSOR_LOG_MAX_BYTES", + "options": null, + "type": "number", + "value": "100000" + } } diff --git a/cbpi/controller/log_file_controller.py b/cbpi/controller/log_file_controller.py index 8c59da7..993a1f5 100644 --- a/cbpi/controller/log_file_controller.py +++ b/cbpi/controller/log_file_controller.py @@ -31,8 +31,8 @@ class LogController: self.influxdb = self.cbpi.config.get("INFLUXDB", "No") if self.logfiles == "Yes": if name not in self.datalogger: - max_bytes = self.cbpi.config.get("SENSOR_LOG_MAX_BYTES", 1048576) - backup_count = self.cbpi.config.get("SENSOR_LOG_BACKUP_COUNT", 3) + max_bytes = int(self.cbpi.config.get("SENSOR_LOG_MAX_BYTES", 131072)) + backup_count = int(self.cbpi.config.get("SENSOR_LOG_BACKUP_COUNT", 3)) data_logger = logging.getLogger('cbpi.sensor.%s' % name) data_logger.propagate = False @@ -120,10 +120,10 @@ class LogController: df = pd.concat([pd.read_csv(f, parse_dates=True, date_parser=dateparse, index_col='DateTime', names=['DateTime', name], header=None) for f in all_filenames]) logging.info("Read all files for {}".format(names)) # resample if rate provided - # if sample_rate is not None: - # df = df[name].resample(sample_rate).max() - # logging.info("Sampled now for {}".format(names)) - df = df[name].dropna() + if sample_rate is not None: + df = df[name].resample(sample_rate).max() + logging.info("Sampled now for {}".format(names)) + df = df.dropna() # take every nth row so that total number of rows does not exceed max_rows * 2 max_rows = 500 total_rows = df.shape[0] @@ -138,6 +138,7 @@ class LogController: result = pd.merge(result, df, how='outer', left_index=True, right_index=True) data = {"time": df.index.tolist()} + if len(names) > 1: for name in names: data[name] = result[name].interpolate(limit_direction='both', limit=10).tolist() @@ -158,6 +159,8 @@ class LogController: # concat all logs all_filenames = glob.glob('./logs/sensor_%s.log*' % id) df = pd.concat([pd.read_csv(f, parse_dates=True, date_parser=dateparse, index_col='DateTime', names=['DateTime', 'Values'], header=None) for f in all_filenames]) + df = df.resample('60s').max() + df = df.dropna() result[id] = {"time": df.index.astype(str).tolist(), "value":df.Values.tolist()} return result