From 5c2c6b9d8880751551f9d4764d7591dbf500cd8c Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Sun, 9 Aug 2009 21:13:36 +0000 Subject: [PATCH] split daemons into own package --- lib/PXElator/daemons.pm | 78 ++++++++++++++++++++++++++++++ lib/PXElator/httpd.pm | 102 +++++++--------------------------------- 2 files changed, 94 insertions(+), 86 deletions(-) create mode 100644 lib/PXElator/daemons.pm diff --git a/lib/PXElator/daemons.pm b/lib/PXElator/daemons.pm new file mode 100644 index 0000000..5bc6889 --- /dev/null +++ b/lib/PXElator/daemons.pm @@ -0,0 +1,78 @@ +package daemons; + +use warnings; +use strict; + +use File::Slurp; +use Data::Dump qw/dump/; + +use x11; + +our $pids; +$pids = { httpd => $$ } unless defined $pids; # keep pids on refresh + +sub DESTROY { + warn "pids ",dump( $pids ); + foreach ( values %$pids ) { + warn "kill $_"; + kill 1,$_ || kill 9, $_; + } +} + +$SIG{CHLD} = 'IGNORE'; + +sub start_stop { + my $daemon = shift; + + my $pid = $pids->{$daemon}; + my $pid_path = "$server::conf/$daemon.pid"; + + if ( ! $pid && -e $pid_path ) { + my $p = read_file $pid_path; + if ( kill 0, $p ) { + warn "adopted $daemon $p\n"; + return $pids->{$daemon} = $p; + } else { + warn "old $daemon $p not running"; + unlink $pid_path; + } + } + + $pid ||= 'not started'; + warn "start_stop $daemon $pid\n"; + + if ( $pid =~ m{^\d+$} ) { + my $pstree = `pstree -p $pid`; + my @pids = $pstree =~ m{\((\d+)\)}g; + warn "pstree $pstree pids ",dump( @pids ); + kill 1, $_ foreach reverse @pids; + $pids->{$daemon} = 'stopped'; + return qq|$daemon pid $pid stopped|; + } else { + if ( $pid = fork ) { + # parent + $pids->{$daemon} = $pid; + write_file $pid_path, $pid; + warn "forked $daemon $pid\n"; + return qq|$daemon pid $pid started|; + } elsif ( defined $pid ) { + # child + my $invoke = 'start'; + $invoke = $1 if $daemon =~ s{/(.+)}{}; + if ( $daemon =~ m{dhcpd|tftpd|dnsd} ) { + my $exec = "perl -I$server::base_dir/lib -I$server::base_dir/lib/PXElator -M$daemon -e ${daemon}::${invoke}"; + warn "exec $exec"; + x11::xterm( $daemon => $exec ); + } else { + my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')'; + warn "eval $eval"; + eval $eval; + warn "can't start $daemon: $@" if $@; + } + exit; + } else { + die "fork error $!"; + } + } +} + diff --git a/lib/PXElator/httpd.pm b/lib/PXElator/httpd.pm index a2ba92f..165641f 100644 --- a/lib/PXElator/httpd.pm +++ b/lib/PXElator/httpd.pm @@ -29,17 +29,6 @@ sub menu {qq{ }} -our $pids; -$pids = { httpd => $$ } unless defined $pids; # keep pids on refresh - -sub DESTROY { - warn "pids ",dump( $pids ); - foreach ( values %$pids ) { - warn "kill $_"; - kill 1,$_ || kill 9, $_; - } -} - our $port = 7777; use server; @@ -54,6 +43,13 @@ use client; use log; use x11; use amt; +use boolean; +use daemons; + +use kvm; +use browser; +use network; + sub static { my ($client,$path) = @_; @@ -105,67 +101,6 @@ sub static { exit(0); } -use boolean; - -use kvm; - -$SIG{CHLD} = 'IGNORE'; - -sub start_stop { - my $daemon = shift; - - my $pid = $pids->{$daemon}; - my $pid_path = "$server::conf/$daemon.pid"; - - if ( ! $pid && -e $pid_path ) { - my $p = read_file $pid_path; - if ( kill 0, $p ) { - warn "adopted $daemon $p\n"; - return $pids->{$daemon} = $p; - } else { - warn "old $daemon $p not running"; - unlink $pid_path; - } - } - - $pid ||= 'not started'; - warn "start_stop $daemon $pid\n"; - - if ( $pid =~ m{^\d+$} ) { - my $pstree = `pstree -p $pid`; - my @pids = $pstree =~ m{\((\d+)\)}g; - warn "pstree $pstree pids ",dump( @pids ); - kill 1, $_ foreach reverse @pids; - $pids->{$daemon} = 'stopped'; - return qq|$daemon pid $pid stopped|; - } else { - if ( $pid = fork ) { - # parent - $pids->{$daemon} = $pid; - write_file $pid_path, $pid; - warn "forked $daemon $pid\n"; - return qq|$daemon pid $pid started|; - } elsif ( defined $pid ) { - # child - my $invoke = 'start'; - $invoke = $1 if $daemon =~ s{/(.+)}{}; - if ( $daemon =~ m{dhcpd|tftpd|dnsd} ) { - my $exec = "perl -I$server::base_dir/lib -I$server::base_dir/lib/PXElator -M$daemon -e ${daemon}::${invoke}"; - warn "exec $exec"; - x11::xterm( $daemon => $exec ); - } else { - my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')'; - warn "eval $eval"; - eval $eval; - warn "can't start $daemon: $@" if $@; - } - exit; - } else { - die "fork error $!"; - } - } -} - my $ok = qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu(); my $redirect = qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $url\r\n\r\n|; @@ -186,9 +121,8 @@ sub get_request { my $debug_proc = ''; - warn 'pids: ', dump( $pids ) if $debug; - foreach my $name ( sort keys %$pids ) { - my $pid = $pids->{$name} || next; + foreach my $name ( sort keys %$daemons::pids ) { + my $pid = $daemons::pids->{$name} || next; my $html; @@ -244,7 +178,7 @@ sub get_request { } elsif ( $path =~ m{^/server} ) { print $client $ok - , html::table( 2, map { ( $_, eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir' ) ) + , html::table( 2, map { ( $_, html::tt eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir', 'conf' ) ) ; } elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) { my $ip = $1 || $client->peerhost; @@ -276,7 +210,7 @@ sub get_request { map { my $ip = $_; $ip =~ s{^.+/ip/}{}; - ( qq|$ip|, client::mac($ip), client::conf( $ip, 'hostname' ), client::conf( $ip, 'deploy' ) ); + ( qq|$ip|, client::mac($ip), client::conf( $ip, 'hostname' ), html::tt client::conf( $ip, 'deploy' ) ); } glob("$server::conf/ip/*") ) @@ -288,7 +222,7 @@ sub get_request { print $client $redirect, qq|$1 = $2
Location: $url|; server::debug( $debug ) if $1 eq 'debug'; } elsif ( $path =~ m{^/start_stop/(\S+)} ) { - print $client $redirect, start_stop($1); + print $client $redirect, daemons::start_stop($1); } elsif ( $path =~ m{^/action/([^/]+)/(.+)} ) { $1->$2(); print $client $redirect; @@ -302,15 +236,13 @@ sub get_request { } -use browser; -use network; - sub start { warn 'tap ', network::tap(); my $server = IO::Socket::INET->new( Proto => 'tcp', + LocalAddr => $server::ip, LocalPort => $httpd::port, Listen => SOMAXCONN, Reuse => 1 @@ -318,11 +250,9 @@ sub start { print "url $url\n"; - start_stop 'browser', $url; - start_stop 'dhcpd'; - start_stop 'tftpd'; - start_stop 'dnsd'; - start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device + daemons::start_stop 'browser', $url; + daemons::start_stop $_ foreach ( qw/dhcpd tftpd dnsd/ ); + daemons::start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device while (1) { my $client = $server->accept() || next; # ALARM trickle us -- 2.20.1