Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
csst-dfs
csst-dfs-commons
Commits
098455c6
Commit
098455c6
authored
2 years ago
by
Wei Shoulin
Browse files
Options
Download
Email Patches
Plain Diff
bug
parent
c5994650
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
csst_dfs_commons/logging/setup.py
+2
-2
csst_dfs_commons/logging/setup.py
csst_dfs_commons/models/common.py
+2
-1
csst_dfs_commons/models/common.py
with
4 additions
and
3 deletions
+4
-3
csst_dfs_commons/logging/setup.py
+
2
-
2
View file @
098455c6
...
@@ -24,7 +24,7 @@ def setup_logging():
...
@@ -24,7 +24,7 @@ def setup_logging():
ch
.
setFormatter
(
cfmt
)
ch
.
setFormatter
(
cfmt
)
# File handler
# File handler
fh
=
logging
.
handlers
.
RotatingFileHandler
(
'csst.log'
,
fh
=
logging
.
handlers
.
RotatingFileHandler
(
'
logs/
csst.log'
,
maxBytes
=
10
*
1024
*
1024
,
backupCount
=
10
)
maxBytes
=
10
*
1024
*
1024
,
backupCount
=
10
)
fh
.
setLevel
(
logging
.
INFO
)
fh
.
setLevel
(
logging
.
INFO
)
fh
.
setFormatter
(
ffmt
)
fh
.
setFormatter
(
ffmt
)
...
@@ -58,7 +58,7 @@ def setup_test_logging():
...
@@ -58,7 +58,7 @@ def setup_test_logging():
ch
.
setFormatter
(
cfmt
)
ch
.
setFormatter
(
cfmt
)
# Outputs DEBUG level logging to file
# Outputs DEBUG level logging to file
fh
=
logging
.
FileHandler
(
'csst-test.log'
)
fh
=
logging
.
FileHandler
(
'
logs/
csst-test.log'
)
fh
.
setLevel
(
logging
.
DEBUG
)
fh
.
setLevel
(
logging
.
DEBUG
)
fh
.
setFormatter
(
ffmt
)
fh
.
setFormatter
(
ffmt
)
...
...
This diff is collapsed.
Click to expand it.
csst_dfs_commons/models/common.py
+
2
-
1
View file @
098455c6
...
@@ -38,6 +38,7 @@ class BaseModel:
...
@@ -38,6 +38,7 @@ class BaseModel:
return
None
return
None
for
k
in
self
.
__dataclass_fields__
.
keys
():
for
k
in
self
.
__dataclass_fields__
.
keys
():
if
k
==
'header'
:
if
k
==
'header'
:
if
record
.
__getattribute__
(
k
):
self
.
__setattr__
(
k
,
json
.
loads
(
record
.
__getattribute__
(
k
)))
self
.
__setattr__
(
k
,
json
.
loads
(
record
.
__getattribute__
(
k
)))
else
:
else
:
self
.
__setattr__
(
k
,
record
.
__getattribute__
(
k
))
self
.
__setattr__
(
k
,
record
.
__getattribute__
(
k
))
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets