Commit 0ac46fbb authored by Matthieu Muffato's avatar Matthieu Muffato
Browse files

runWorker_path is now a JSON Config option, allowing meadow type/name -specific values

parent 76e525a4
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
"SubmitWorkersMax" : 50 "SubmitWorkersMax" : 50
}, },
"Meadow" : { "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, "CleanupTempDirectoryKilledWorkers" : 0,
"MaxLimboSeconds" : 10, "MaxLimboSeconds" : 10,
"MaxRegistrationSeconds" : 30, "MaxRegistrationSeconds" : 30,
......
...@@ -190,10 +190,21 @@ sub pipeline_name { ...@@ -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 @_; 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;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment