diff --git a/Build.PL b/Build.PL index bfe59a26..891fb21a 100644 --- a/Build.PL +++ b/Build.PL @@ -65,7 +65,7 @@ Module::Build->new( 'Socket6' => '0.23', 'Starman' => '0.4008', 'Storable' => 0, - 'SNMP::Info' => '3.38', + 'SNMP::Info' => '3.39', 'SQL::Translator' => '0.11018', 'Template' => '2.24', 'Template::Plugin::CSV' => '0.04', diff --git a/Changes b/Changes index 12dd20ba..57d9542a 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,4 @@ -2.037002 - 2017-12-14 +2.037002 - 2017-12-17 [ENHANCEMENTS] diff --git a/META.json b/META.json index 21e1168c..a9c40570 100644 --- a/META.json +++ b/META.json @@ -72,7 +72,7 @@ "Plack::Middleware::ReverseProxy" : "0.15", "Pod::Usage" : "0", "Role::Tiny" : "1.002005", - "SNMP::Info" : "3.38", + "SNMP::Info" : "3.39", "SQL::Translator" : "0.11018", "Scope::Guard" : "0", "Sereal" : "0", @@ -105,7 +105,7 @@ "provides" : { "App::Netdisco" : { "file" : "lib/App/Netdisco.pm", - "version" : "2.037001" + "version" : "2.037002" }, "App::Netdisco::AnyEvent::Nbtstat" : { "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm" @@ -749,7 +749,7 @@ }, "homepage" : "http://netdisco.org/", "license" : [ - "http://opensource.org/licenses/bsd-license.php" + "http://opensource.org/licenses/BSD-3-Clause" ], "repository" : { "url" : "https://github.com/netdisco/netdisco" @@ -757,6 +757,6 @@ "x_IRC" : "irc://irc.freenode.org/#netdisco", "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users" }, - "version" : "2.037001", + "version" : "2.037002", "x_serialization_backend" : "JSON::PP version 2.94" } diff --git a/META.yml b/META.yml index a53f9893..c93de218 100644 --- a/META.yml +++ b/META.yml @@ -18,7 +18,7 @@ name: App-Netdisco provides: App::Netdisco: file: lib/App/Netdisco.pm - version: '2.037001' + version: '2.037002' App::Netdisco::AnyEvent::Nbtstat: file: lib/App/Netdisco/AnyEvent/Nbtstat.pm App::Netdisco::Backend::Job: @@ -492,7 +492,7 @@ requires: Plack::Middleware::ReverseProxy: '0.15' Pod::Usage: '0' Role::Tiny: '1.002005' - SNMP::Info: '3.38' + SNMP::Info: '3.39' SQL::Translator: '0.11018' Scope::Guard: '0' Sereal: '0' @@ -518,7 +518,7 @@ resources: MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users bugtracker: https://github.com/netdisco/netdisco/issues homepage: http://netdisco.org/ - license: http://opensource.org/licenses/bsd-license.php + license: http://opensource.org/licenses/BSD-3-Clause repository: https://github.com/netdisco/netdisco -version: '2.037001' +version: '2.037002' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm index 6443f2f7..55792f44 100644 --- a/lib/App/Netdisco.pm +++ b/lib/App/Netdisco.pm @@ -4,7 +4,7 @@ use strict; use warnings; use 5.010_000; -our $VERSION = '2.037001'; +our $VERSION = '2.037002'; use App::Netdisco::Configuration; =head1 NAME diff --git a/lib/App/Netdisco/JobQueue/PostgreSQL.pm b/lib/App/Netdisco/JobQueue/PostgreSQL.pm index 80405701..53ead077 100644 --- a/lib/App/Netdisco/JobQueue/PostgreSQL.pm +++ b/lib/App/Netdisco/JobQueue/PostgreSQL.pm @@ -87,12 +87,10 @@ sub jq_getsome { my $hiprio = $jobs->search({ %jobsearch, - -or => [{ - username => { '!=' => undef }, - action => { -in => setting('job_prio')->{'normal'} }, - },{ - action => { -in => setting('job_prio')->{'high'} }, - }], + -or => [ + { username => { '!=' => undef } }, + { action => { -in => setting('job_prio')->{'high'} } }, + ], }, { %randoms, '+select' => [\'100 as job_priority'], '+as' => ['me.job_priority'], @@ -100,7 +98,7 @@ sub jq_getsome { my $loprio = $jobs->search({ %jobsearch, - action => { -in => setting('job_prio')->{'normal'} }, + action => { -not_in => setting('job_prio')->{'high'} }, }, { %randoms, '+select' => [\'0 as job_priority'], '+as' => ['me.job_priority'],