From 098455c6a231ad4c65253d4704746b60ae4bc793 Mon Sep 17 00:00:00 2001 From: shoulinwei Date: Thu, 10 Nov 2022 14:38:48 +0800 Subject: [PATCH] bug --- csst_dfs_commons/logging/setup.py | 4 ++-- csst_dfs_commons/models/common.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/csst_dfs_commons/logging/setup.py b/csst_dfs_commons/logging/setup.py index fd0f57c..bc7fb68 100644 --- a/csst_dfs_commons/logging/setup.py +++ b/csst_dfs_commons/logging/setup.py @@ -24,7 +24,7 @@ def setup_logging(): ch.setFormatter(cfmt) # File handler - fh = logging.handlers.RotatingFileHandler('csst.log', + fh = logging.handlers.RotatingFileHandler('logs/csst.log', maxBytes=10*1024*1024, backupCount=10) fh.setLevel(logging.INFO) fh.setFormatter(ffmt) @@ -58,7 +58,7 @@ def setup_test_logging(): ch.setFormatter(cfmt) # Outputs DEBUG level logging to file - fh = logging.FileHandler('csst-test.log') + fh = logging.FileHandler('logs/csst-test.log') fh.setLevel(logging.DEBUG) fh.setFormatter(ffmt) diff --git a/csst_dfs_commons/models/common.py b/csst_dfs_commons/models/common.py index ed51da9..3617601 100644 --- a/csst_dfs_commons/models/common.py +++ b/csst_dfs_commons/models/common.py @@ -38,7 +38,8 @@ class BaseModel: return None for k in self.__dataclass_fields__.keys(): if k == 'header': - self.__setattr__(k, json.loads(record.__getattribute__(k))) + if record.__getattribute__(k): + self.__setattr__(k, json.loads(record.__getattribute__(k))) else: self.__setattr__(k, record.__getattribute__(k)) return self -- GitLab