X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FWatchDog.pm;h=3d47ac485d3cecd97903421c80c8675a3df718d2;hp=2a3fc6160e82ac089339c6e4227a270f2de030e7;hb=8d757beb3bd870615c5a5b3076f7dc72ae9cc637;hpb=c824fdf36c659b3b6dbafe23a3021f2b1d6eeb3f diff --git a/lib/Object/Remote/WatchDog.pm b/lib/Object/Remote/WatchDog.pm index 2a3fc61..3d47ac4 100644 --- a/lib/Object/Remote/WatchDog.pm +++ b/lib/Object/Remote/WatchDog.pm @@ -4,16 +4,6 @@ use Object::Remote::MiniLoop; use Object::Remote::Logging qw ( :log :dlog ); use Moo; -BEGIN { - $SIG{ALRM} = sub { - #if the Watchdog is killing the process we don't want any chance of the - #process not actually exiting and die could be caught by an eval which - #doesn't do us any good - log_error { sprintf("Watchdog has expired, terminating the process at file %s line %s", __FILE__, __LINE__ + 1); }; - exit(1); - }; -}; - has timeout => ( is => 'ro', required => 1 ); around new => sub { @@ -28,6 +18,15 @@ around new => sub { #start the watchdog sub BUILD { my ($self) = @_; + + $SIG{ALRM} = sub { + #if the Watchdog is killing the process we don't want any chance of the + #process not actually exiting and die could be caught by an eval which + #doesn't do us any good + log_error { sprintf("Watchdog has expired, terminating the process at file %s line %s", __FILE__, __LINE__ + 1); }; + exit(1); + }; + Dlog_debug { "Initializing watchdog with timeout of $_ seconds" } $self->timeout; alarm($self->timeout); } @@ -39,7 +38,7 @@ sub reset { die "Attempt to reset the watchdog before it was constructed" unless defined $WATCHDOG; - log_trace { "Watchdog has been reset" }; + log_debug { "Watchdog has been reset" }; alarm($WATCHDOG->timeout); } @@ -49,6 +48,7 @@ sub reset { #it makes sense to still terminate the process sub shutdown { my ($self) = @_; + log_debug { "Watchdog is shutting down" }; alarm(0); }