Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
0d7f2e15
Commit
0d7f2e15
authored
Dec 12, 2020
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Download Debug package
- include config - bugfix for stream logger
parent
b637a63e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
config_sql.py
cps/config_sql.py
+8
-0
debug_info.py
cps/debug_info.py
+4
-0
No files found.
cps/config_sql.py
View file @
0d7f2e15
...
@@ -272,6 +272,14 @@ class _ConfigSQL(object):
...
@@ -272,6 +272,14 @@ class _ConfigSQL(object):
setattr
(
self
,
field
,
new_value
)
setattr
(
self
,
field
,
new_value
)
return
True
return
True
def
toDict
(
self
):
storage
=
{}
for
k
,
v
in
self
.
__dict__
.
items
():
if
k
[
0
]
!=
'_'
or
k
.
endswith
(
"password"
):
storage
[
k
]
=
v
return
storage
def
load
(
self
):
def
load
(
self
):
'''Load all configuration values from the underlying storage.'''
'''Load all configuration values from the underlying storage.'''
s
=
self
.
_read_from_storage
()
# type: _Settings
s
=
self
.
_read_from_storage
()
# type: _Settings
...
...
cps/debug_info.py
View file @
0d7f2e15
...
@@ -44,8 +44,12 @@ def assemble_logfiles(file_name):
...
@@ -44,8 +44,12 @@ def assemble_logfiles(file_name):
def
send_debug
():
def
send_debug
():
file_list
=
glob
.
glob
(
logger
.
get_logfile
(
config
.
config_logfile
)
+
'*'
)
file_list
=
glob
.
glob
(
logger
.
get_logfile
(
config
.
config_logfile
)
+
'*'
)
file_list
.
extend
(
glob
.
glob
(
logger
.
get_accesslogfile
(
config
.
config_access_logfile
)
+
'*'
))
file_list
.
extend
(
glob
.
glob
(
logger
.
get_accesslogfile
(
config
.
config_access_logfile
)
+
'*'
))
for
element
in
[
logger
.
LOG_TO_STDOUT
,
logger
.
LOG_TO_STDERR
]:
if
element
in
file_list
:
file_list
.
remove
(
element
)
memory_zip
=
io
.
BytesIO
()
memory_zip
=
io
.
BytesIO
()
with
zipfile
.
ZipFile
(
memory_zip
,
'w'
,
compression
=
zipfile
.
ZIP_DEFLATED
)
as
zf
:
with
zipfile
.
ZipFile
(
memory_zip
,
'w'
,
compression
=
zipfile
.
ZIP_DEFLATED
)
as
zf
:
zf
.
writestr
(
'settings.txt'
,
json
.
dumps
(
config
.
toDict
()))
zf
.
writestr
(
'libs.txt'
,
json
.
dumps
(
collect_stats
()))
zf
.
writestr
(
'libs.txt'
,
json
.
dumps
(
collect_stats
()))
for
fp
in
file_list
:
for
fp
in
file_list
:
zf
.
write
(
fp
,
os
.
path
.
basename
(
fp
))
zf
.
write
(
fp
,
os
.
path
.
basename
(
fp
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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