diff --git a/Build.PL b/Build.PL index dad71c53..eac12a15 100644 --- a/Build.PL +++ b/Build.PL @@ -58,7 +58,6 @@ Module::Build->new( 'Sereal' => '0', 'Socket6' => '0.23', 'Starman' => '0.4008', - (($^O eq 'linux') ? ('Sys::Proctitle' => '0') : ()), 'SNMP::Info' => '3.34', 'SQL::Translator' => '0.11018', 'Template' => '2.24', diff --git a/Changes b/Changes index 56016735..d4706074 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,9 @@ +2.036003 - TESTING + + [BUG FIXES] + + * #322 cease use of Sys::Proctitle + 2.036002 - 2017-06-26 [ENHANCEMENTS] diff --git a/bin/netdisco-backend-fg b/bin/netdisco-backend-fg index 2f8f2935..6944f561 100755 --- a/bin/netdisco-backend-fg +++ b/bin/netdisco-backend-fg @@ -7,9 +7,6 @@ use FindBin; FindBin::again(); use Path::Class 'dir'; -# get a segfault if we load this later -use if $^O eq 'linux', 'Sys::Proctitle'; - BEGIN { # stuff useful locations into @INC unshift @INC, diff --git a/lib/App/Netdisco/Util/Backend.pm b/lib/App/Netdisco/Util/Backend.pm index f441a24a..575959b7 100644 --- a/lib/App/Netdisco/Util/Backend.pm +++ b/lib/App/Netdisco/Util/Backend.pm @@ -5,20 +5,10 @@ use warnings; use MCE::Util (); -# make sure this is already done elsewhere -use if $^O eq 'linux', 'Sys::Proctitle'; - use base 'Exporter'; our @EXPORT = qw/prctl parse_max_workers/; -sub prctl { - if ($^O eq 'linux') { - Sys::Proctitle::setproctitle(shift); - } - else { - $0 = shift; - } -} +sub prctl { $0 = shift } sub parse_max_workers { my $max = shift;