From: Tyler Riddle Date: Mon, 28 Jan 2013 20:35:41 +0000 (-0800) Subject: removed the baked in ulimit and nice code, use custom perl_command instead X-Git-Tag: v0.003001_01~13 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=commitdiff_plain;h=9cd7015d3259e4e95d456a5da667fe504de9bcd2 removed the baked in ulimit and nice code, use custom perl_command instead --- diff --git a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm index 090f132..b26e4a6 100644 --- a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm +++ b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm @@ -13,8 +13,6 @@ use Moo::Role; with 'Object::Remote::Role::Connector'; has module_sender => (is => 'lazy'); -has ulimit => ( is => 'ro'); -has nice => ( is => 'ro'); has watchdog_timeout => ( is => 'ro', required => 1, default => sub { undef }); has forward_env => (is => 'ro', required => 1, builder => 1); has perl_command => (is => 'lazy'); @@ -34,30 +32,14 @@ sub _build_module_sender { return $hook ? $hook->sender : Object::Remote::ModuleSender->new; } -#FIXME by policy object-remote does not invoke a shell +#By policy object-remote does not invoke a shell sub _build_perl_command { - my ($self) = @_; - my $nice = $self->nice; - my $ulimit = $self->ulimit; - my $perl_path = 'perl'; - my $shell_code = ''; - - if (defined($ulimit)) { - $shell_code .= "ulimit $ulimit || exit 1; "; - } - - if (defined($nice)) { - $shell_code .= "nice -n $nice "; - } - - if (defined($ENV{OBJECT_REMOTE_PERL_BIN})) { - log_debug { "Using OBJECT_REMOTE_PERL_BIN environment variable as perl path" }; - $perl_path = $ENV{OBJECT_REMOTE_PERL_BIN}; + my $perl_bin = 'perl'; + + if (exists $ENV{OBJECT_REMOTE_PERL_BIN}) { + $perl_bin = $ENV{OBJECT_REMOTE_PERL_BIN}; } - - $shell_code .= $perl_path . ' -'; - - return [ 'bash', '-c', $shell_code ]; + return [qw(perl -)]; } sub _build_forward_env {