Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
SiCKRAGE
sickrage
Commits
73ae82c4
Commit
73ae82c4
authored
Jun 26, 2022
by
echel0n
Browse files
fix startup issue
fix config migration
parent
9910aad4
Changes
2
Hide whitespace changes
Inline
Side-by-side
sickrage/__init__.py
View file @
73ae82c4
...
...
@@ -484,6 +484,9 @@ def start():
app
.
pid
=
app
.
daemon
.
pid
app
.
start
()
from
tornado.ioloop
import
IOLoop
IOLoop
.
current
().
start
()
except
(
SystemExit
,
KeyboardInterrupt
):
if
app
:
app
.
shutdown
()
...
...
sickrage/core/config/__init__.py
View file @
73ae82c4
...
...
@@ -1131,8 +1131,7 @@ class Config(object):
self
.
nmjv2
.
enable
=
self
.
_get_config_file_value
(
config_object
,
'NMJv2'
,
'use_nmjv2'
,
default
=
self
.
nmjv2
.
enable
,
field_type
=
bool
)
self
.
nmjv2
.
host
=
self
.
_get_config_file_value
(
config_object
,
'NMJv2'
,
'nmjv2_host'
,
default
=
self
.
nmjv2
.
host
,
field_type
=
str
)
self
.
nmjv2
.
database
=
self
.
_get_config_file_value
(
config_object
,
'NMJv2'
,
'nmjv2_database'
,
default
=
self
.
nmjv2
.
database
,
field_type
=
str
)
self
.
nmjv2
.
db_loc
=
NMJv2Location
[
self
.
_get_config_file_value
(
config_object
,
'NMJv2'
,
'nmjv2_dbloc'
,
default
=
NMJv2Location
.
LOCAL
.
name
,
field_type
=
str
.
upper
)]
self
.
nmjv2
.
db_loc
=
NMJv2Location
[
self
.
_get_config_file_value
(
config_object
,
'NMJv2'
,
'nmjv2_dbloc'
,
default
=
NMJv2Location
.
LOCAL
.
name
,
field_type
=
str
.
upper
)]
# SYNOLOGY SETTINGS
self
.
synology
.
host
=
self
.
_get_config_file_value
(
config_object
,
'SynologyDSM'
,
'syno_dsm_host'
,
default
=
self
.
synology
.
host
,
field_type
=
str
)
...
...
@@ -1424,9 +1423,7 @@ class Config(object):
if
key
in
section_object
:
try
:
value
=
self
.
convert_value
(
section_object
.
get
(
key
),
field_type
)
if
value
is
None
:
return
default
return
value
return
value
or
default
except
Exception
:
return
default
...
...
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