Show
Ignore:
Timestamp:
05/29/07 23:12:01 (1 year ago)
Author:
kindlund
Message:

Merged kindlund-filesystem branch back into trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • honeyclient/trunk/bin/StartAgent.pl

    r333 r409  
    77use Carp (); 
    88 
     9use HoneyClient::Util::Config qw(getVar); 
    910use HoneyClient::Agent; 
    1011use HoneyClient::Util::SOAP qw(getClientHandle); 
     
    1213use MIME::Base64 qw(decode_base64 encode_base64); 
    1314use Storable qw(thaw nfreeze); 
     15use Log::Log4perl qw(:easy); 
     16 
     17# The global logging object. 
     18our $LOG = get_logger(); 
    1419 
    1520our ($stub, $som); 
     
    1823our $agentState = undef; 
    1924my $tempState = undef; 
     25our $faultDetected = 0; 
    2026 
    2127print "URL: " . $URL. "\n"; 
     
    3541    } 
    3642 
    37     print "Watchdog fault detected, recovering Agent daemon.\n"; 
     43    if (!$faultDetected) { 
     44        $LOG->error("Watchdog fault detected, recovering Agent daemon."); 
     45        $faultDetected = 1; 
     46    } 
    3847    # XXX: Reenable this, eventually. 
    39     #Carp::carp __PACKAGE__ . "->_watchdogFaultHandler(): Error occurred during processing.\n" . $errMsg; 
     48    $LOG->error(__PACKAGE__ . "->_watchdogFaultHandler(): Error occurred during processing.\n" . $errMsg); 
     49    Carp::carp __PACKAGE__ . "->_watchdogFaultHandler(): Error occurred during processing.\n" . $errMsg; 
    4050 
    4151