Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
ensembl-gh-mirror
ensembl-hive
Commits
0ac46fbb
Commit
0ac46fbb
authored
Dec 13, 2017
by
Matthieu Muffato
Browse files
runWorker_path is now a JSON Config option, allowing meadow type/name -specific values
parent
76e525a4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
hive_config.json
hive_config.json
+3
-0
modules/Bio/EnsEMBL/Hive/Meadow.pm
modules/Bio/EnsEMBL/Hive/Meadow.pm
+13
-2
No files found.
hive_config.json
View file @
0ac46fbb
...
...
@@ -7,6 +7,9 @@
"SubmitWorkersMax"
:
50
},
"Meadow"
:
{
"REMARKS"
:
{
"RunWorkerPath"
:
"The path of runWorker.pl . When null or missing, beekeeper will use $EHIVE_ROOT_DIR or its own path. When RunWorkerPath is '', beekeeper assumes runWorker.pl is in $PATH"
},
"CleanupTempDirectoryKilledWorkers"
:
0
,
"MaxLimboSeconds"
:
10
,
"MaxRegistrationSeconds"
:
30
,
...
...
modules/Bio/EnsEMBL/Hive/Meadow.pm
View file @
0ac46fbb
...
...
@@ -190,10 +190,21 @@ sub pipeline_name {
}
sub
runWorker_path
{
# FIXME: can be made dependent on config options
=head2 runWorker_path
Title : runWorker_path
Function: Getter for the path to runWorker.pl
This is now set in the JSON config file. When missing or set to null,
defaults to $EHIVE_ROOT_DIR/scripts
=cut
sub
runWorker_path
{
my
$self
=
shift
@_
;
return
$ENV
{'
EHIVE_ROOT_DIR
'}
.
'
/scripts/
';
my
$path
=
$self
->
config_get
('
RunWorkerPath
')
//
$ENV
{'
EHIVE_ROOT_DIR
'}
.
'
/scripts/
';
$path
=
$path
.
'
/
'
unless
$path
=~
/\/$/
;
return
$path
;
}
...
...
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