Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
genotoul-bioinfo
D-GENIES
Commits
8bb77227
Commit
8bb77227
authored
Feb 15, 2018
by
Floreal Cabanettes
Browse files
Remove fail on non required sections of config + fix default for sqlite db
parent
bac9e755
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/dgenies/config_reader.py
View file @
8bb77227
...
...
@@ -156,7 +156,7 @@ class AppConfigReader:
def
_get_database_type
(
self
):
try
:
return
self
.
reader
.
get
(
"database"
,
"type"
)
except
NoOptionError
:
except
(
NoSectionError
,
NoOptionError
)
:
return
"sqlite"
def
_get_database_url
(
self
):
...
...
@@ -170,13 +170,13 @@ class AppConfigReader:
except
FileNotFoundError
:
pass
return
url
except
NoOptionError
:
return
":memory:"
except
(
NoSectionError
,
NoOptionError
)
:
return
self
.
_replace_vars
(
"###USER###/.dgenies/database.sqlite"
)
def
_get_database_port
(
self
):
try
:
return
int
(
self
.
reader
.
get
(
"database"
,
"port"
))
except
(
NoOptionError
,
ValueError
):
except
(
NoSectionError
,
NoOptionError
,
ValueError
):
db_type
=
self
.
_get_database_type
()
if
db_type
==
"mysql"
:
return
3306
...
...
@@ -190,7 +190,7 @@ class AppConfigReader:
if
db
==
""
:
raise
ValueError
()
return
db
except
(
NoOptionError
,
ValueError
):
except
(
NoSectionError
,
NoOptionError
,
ValueError
):
if
self
.
_get_database_type
()
==
"sqlite"
:
return
""
raise
Exception
(
"Missing parameter: database db name"
)
...
...
@@ -201,7 +201,7 @@ class AppConfigReader:
if
user
==
""
:
raise
ValueError
()
return
user
except
(
NoOptionError
,
ValueError
):
except
(
NoSectionError
,
NoOptionError
,
ValueError
):
if
self
.
_get_database_type
()
==
"sqlite"
:
return
""
raise
Exception
(
"Missing parameter: database user"
)
...
...
@@ -212,7 +212,7 @@ class AppConfigReader:
if
passwd
==
""
:
raise
ValueError
()
return
passwd
except
(
NoOptionError
,
ValueError
):
except
(
NoSectionError
,
NoOptionError
,
ValueError
):
if
self
.
_get_database_type
()
==
"sqlite"
:
return
""
raise
Exception
(
"Missing parameter: database password"
)
...
...
@@ -220,31 +220,31 @@ class AppConfigReader:
def
_get_mail_status_sender
(
self
):
try
:
return
self
.
_replace_vars
(
self
.
reader
.
get
(
"mail"
,
"status"
))
except
NoOptionError
:
except
(
NoSectionError
,
NoOptionError
)
:
return
"status@dgenies"
def
_get_mail_reply
(
self
):
try
:
return
self
.
_replace_vars
(
self
.
reader
.
get
(
"mail"
,
"reply"
))
except
NoOptionError
:
except
(
NoSectionError
,
NoOptionError
)
:
return
"status@dgenies"
def
_get_mail_org
(
self
):
try
:
return
self
.
_replace_vars
(
self
.
reader
.
get
(
"mail"
,
"org"
))
except
NoOptionError
:
except
(
NoSectionError
,
NoOptionError
)
:
return
None
def
_get_send_mail_status
(
self
):
try
:
return
self
.
reader
.
get
(
"mail"
,
"send_mail_status"
).
lower
()
==
"true"
except
NoOptionError
:
except
(
NoSectionError
,
NoOptionError
)
:
return
True
def
_get_disable_mail
(
self
):
try
:
return
self
.
reader
.
get
(
"mail"
,
"disable"
).
lower
()
==
"true"
except
NoOptionError
:
except
(
NoSectionError
,
NoOptionError
)
:
return
False
def
_get_cron_clean_time
(
self
):
...
...
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