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

remove fixes for MCE

Browse Source
This commit is contained in:
Oliver Gorwits
2013-01-06 01:12:24 +00:00
parent dbb2cbecf4
commit b99b1faba5
3 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/MANIFEST
View File

@@ -4,6 +4,7 @@ bin/netdisco-daemon-fg
bin/netdisco-db-deploy bin/netdisco-db-deploy
bin/netdisco-deploy bin/netdisco-deploy
bin/netdisco-web bin/netdisco-web
bin/netdisco-web-fg
Changes Changes
inc/Module/Install.pm inc/Module/Install.pm
inc/Module/Install/Base.pm inc/Module/Install/Base.pm

2
Netdisco/Makefile.PL
View File

@@ -16,7 +16,7 @@ requires 'HTML::Entities' => 0;
requires 'HTTP::Tiny' => 0; requires 'HTTP::Tiny' => 0;
requires 'JSON' => 0; requires 'JSON' => 0;
requires 'List::MoreUtils' => 0; requires 'List::MoreUtils' => 0;
requires 'MCE' => 1.304; requires 'MCE' => 1.305;
requires 'Net::MAC' => 0; requires 'Net::MAC' => 0;
requires 'NetAddr::IP' => 0; requires 'NetAddr::IP' => 0;
requires 'Path::Class' => 0; requires 'Path::Class' => 0;

28
Netdisco/bin/netdisco-daemon-fg
View File

@@ -13,18 +13,10 @@ use App::Netdisco::Daemon::Queue ':all';
# needed to quench AF_INET6 symbol errors # needed to quench AF_INET6 symbol errors
use NetAddr::IP::Lite ':lower'; use NetAddr::IP::Lite ':lower';
BEGIN { # set temporary MCE files' location in home directory
# set temporary location in home directory use Path::Class 'dir';
# this should probably be overridable my $tmp_dir = ($ENV{NETDISCO_TEMP} || dir($ENV{HOME}, 'tmp'));
use Path::Class 'dir'; mkdir $tmp_dir if ! -d $tmp_dir;
my $tmp_dir = dir($ENV{HOME}, 'tmp');
mkdir $tmp_dir if ! -d $tmp_dir;
$ENV{TEMP} = $tmp_dir;
# set a new process group using our own process ID
# (as this is what MCE uses to signal the children)
setpgrp($$, 0);
}
use MCE; use MCE;
use Role::Tiny::With; use Role::Tiny::With;
@@ -32,18 +24,17 @@ use Role::Tiny::With;
my $mce = MCE->new( my $mce = MCE->new(
spawn_delay => 0.15, spawn_delay => 0.15,
job_delay => 0.15, job_delay => 0.15,
tmp_dir => $tmp_dir;
user_func => sub { $_[0]->worker_body }, user_func => sub { $_[0]->worker_body },
on_post_exit => \&restart_worker, on_post_exit => \&restart_worker,
user_tasks => build_tasks_list(), user_tasks => build_tasks_list(),
)->run(); )->run();
sub build_tasks_list { sub build_tasks_list {
my $tasks = []; my $tasks = [{
push @$tasks, {
max_workers => 1, max_workers => 1,
user_begin => worker_factory('Manager'), user_begin => worker_factory('Manager'),
}; }];
set(daemon_pollers => 2) set(daemon_pollers => 2)
if !defined setting('daemon_pollers'); if !defined setting('daemon_pollers');
@@ -74,11 +65,6 @@ sub worker_factory {
# $self->sendto('stderr', ">>> worker $wid starting with role $role\n"); # $self->sendto('stderr', ">>> worker $wid starting with role $role\n");
Role::Tiny->apply_roles_to_object($self, "App::Netdisco::Daemon::Worker::$role"); Role::Tiny->apply_roles_to_object($self, "App::Netdisco::Daemon::Worker::$role");
# XXX temporary work around for MCE's use of __DIE__
my $mce_die = $SIG{__DIE__};
$SIG{__DIE__} = sub { CORE::die($@) if $^S; $mce_die->(@_) };
# XXX "there's nothing so permanent as temporary..." ~~ Milton Friedman
$self->worker_begin if $self->can('worker_begin'); $self->worker_begin if $self->can('worker_begin');
}; };
} }