use IPC::Open3;
use IO::Handle;
use Symbol;
-use Object::Remote::Logging qw( :log :dlog get_router );
+use Object::Remote::Logging qw( :log :dlog router );
use Object::Remote::ModuleSender;
use Object::Remote::Handle;
use Object::Remote::Future;
my ($conn) = $f->get;
$self->_setup_watchdog_reset($conn);
my $sub = $conn->remote_sub('Object::Remote::Logging::init_logging_forwarding');
- $sub->('Object::Remote::Logging', router => get_router, connection_id => $conn->_id);
+ $sub->('Object::Remote::Logging', router => router(), connection_id => $conn->_id);
Object::Remote::Handle->new(
connection => $conn,
class => 'Object::Remote::ModuleLoader',
sub fatnode_text {
my ($self) = @_;
+ my $connection_timeout = $self->timeout;
+ my $watchdog_timeout = $self->watchdog_timeout;
my $text = '';
require Object::Remote::FatNode;
- if (defined($self->watchdog_timeout)) {
- $text = "my \$WATCHDOG_TIMEOUT = '" . $self->watchdog_timeout . "';\n";
- $text .= "alarm(\$WATCHDOG_TIMEOUT);\n";
+ if (defined($connection_timeout)) {
+ $text .= "alarm($connection_timeout);\n";
+ }
+
+ if (defined($watchdog_timeout)) {
+ $text .= "my \$WATCHDOG_TIMEOUT = $watchdog_timeout;\n";
} else {
- $text = "my \$WATCHDOG_TIMEOUT = undef;\n";
+ $text .= "my \$WATCHDOG_TIMEOUT = undef;\n";
}
$text .= <<'END';