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
8d2959f6
Commit
8d2959f6
authored
Feb 19, 2018
by
Floreal Cabanettes
Browse files
Fix clean cron def
parent
9aada461
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/dgenies/lib/crons.py
View file @
8d2959f6
...
...
@@ -34,6 +34,14 @@ class Crons:
self
.
init_clean_cron
()
self
.
init_launch_local_cron
()
@
staticmethod
def
_get_python_exec
():
pyexec
=
sys
.
executable
match
=
re
.
match
(
r
"^(.+)/lib/(python[^/]+)/((site-packages/bin/python)|())$"
,
pyexec
)
if
match
:
pyexec
=
"%s/bin/%s"
%
(
match
.
group
(
1
),
match
.
group
(
2
))
return
pyexec
def
init_clean_cron
(
self
):
"""
Clean cron is launched at 1h00am each day
...
...
@@ -41,8 +49,9 @@ class Crons:
clean_time
=
self
.
config
.
cron_clean_time
clean_freq
=
self
.
config
.
cron_clean_freq
if
self
.
base_dir
is
not
None
:
job
=
self
.
my_cron
.
new
(
sys
.
executable
+
" {0}/bin/clean_jobs.py > {0}/clean.log 2>&1"
.
format
(
self
.
config
.
log_dir
),
job
=
self
.
my_cron
.
new
(
self
.
_get_python_exec
()
+
" {0}/bin/clean_jobs.py > {1}/clean.log 2>&1"
.
format
(
self
.
base_dir
,
self
.
config
.
log_dir
),
comment
=
"dgenies"
)
job
.
day
.
every
(
clean_freq
)
job
.
hour
.
on
(
clean_time
[
0
])
...
...
@@ -57,10 +66,7 @@ class Crons:
:return:
"""
if
self
.
base_dir
is
not
None
:
pyexec
=
sys
.
executable
match
=
re
.
match
(
r
"^(.+)/lib/(python[^/]+)/((site-packages/bin/python)|())$"
,
pyexec
)
if
match
:
pyexec
=
"%s/bin/%s"
%
(
match
.
group
(
1
),
match
.
group
(
2
))
pyexec
=
self
.
_get_python_exec
()
logs
=
os
.
path
.
join
(
self
.
config
.
log_dir
,
"local_scheduler.log"
)
if
self
.
debug
else
"/dev/null"
job
=
self
.
my_cron
.
new
(
"{0}/bin/start_local_scheduler.sh {0} {1} {2} {3} > /dev/null 2>&1 &"
.
format
(
self
.
base_dir
,
pyexec
,
self
.
local_scheduler_pid_file
,
logs
),
...
...
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