135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow custom actions to be handled by scheduler

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-17 20:14:21 +00:00
parent c8806beaca
commit 8d6bfcf0b2
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/App/Netdisco/JobQueue/PostgreSQL.pm
View File

@@ -87,12 +87,10 @@ sub jq_getsome {
my $hiprio = $jobs->search({ my $hiprio = $jobs->search({
%jobsearch, %jobsearch,
-or => [{ -or => [
username => { '!=' => undef }, { username => { '!=' => undef } },
action => { -in => setting('job_prio')->{'normal'} }, { action => { -in => setting('job_prio')->{'high'} } },
},{ ],
action => { -in => setting('job_prio')->{'high'} },
}],
}, { }, {
%randoms, %randoms,
'+select' => [\'100 as job_priority'], '+as' => ['me.job_priority'], '+select' => [\'100 as job_priority'], '+as' => ['me.job_priority'],
@@ -100,7 +98,7 @@ sub jq_getsome {
my $loprio = $jobs->search({ my $loprio = $jobs->search({
%jobsearch, %jobsearch,
action => { -in => setting('job_prio')->{'normal'} }, action => { -not_in => setting('job_prio')->{'high'} },
}, { }, {
%randoms, %randoms,
'+select' => [\'0 as job_priority'], '+as' => ['me.job_priority'], '+select' => [\'0 as job_priority'], '+as' => ['me.job_priority'],