Subversion Repositories camp_sysinfo_client_3

Rev

Rev 249 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 249 Rev 256
Line 417... Line 417...
417 
#
 417 
#
418 
#######################################################
 418 
#######################################################
419 
 
 419 
 
420 
sub findFile {
 420 
sub findFile {
421 
   my ( $filename, $directories ) = @_;
 421 
   my ( $filename, $directories ) = @_;
422 
   &logIt( 3, "Looking for $filename in findFile" );
 422 
   #&logIt( 3, "Looking for $filename in findFile" );
423 
   for ( my $i = 0; $i < scalar( @{$directories} ); $i++ ) {
 423 
   for ( my $i = 0; $i < scalar( @{$directories} ); $i++ ) {
424 
      my $confFile = $$directories[$i] . '/' . $filename;
 424 
      my $confFile = $$directories[$i] . '/' . $filename;
425 
      &logIt( 4, "Looking for $filename in $confFile" );
 425 
      #&logIt( 4, "Looking for $filename in $confFile" );
426 
      return $confFile if ( -f $confFile );
 426 
      return $confFile if ( -f $confFile );
427 
   }
 427 
   }
428 
   return '';
 428 
   return '';
429 
}
 429 
}
430
430
Line 443... Line 443...
443 
 
 443 
 
444 
sub loadConfigurationFile {
444 
sub loadConfigurationFile {
445 
   my ( $fileName, @searchPath ) = @_;
 445 
   my ( $fileName, @searchPath ) = @_;
446 
   $$fileName = $configurationFile unless $$fileName;
 446 
   $$fileName = $configurationFile unless $$fileName;
447 
   @searchPath = @confFileSearchPath unless @searchPath;
 447 
   @searchPath = @confFileSearchPath unless @searchPath;
448 
   &logIt( 2, "Looking for config file $$fileName in " . join( ', ', @searchPath ) );
 448 
   #&logIt( '', 2, "Looking for config file $$fileName in " . join( ', ', @searchPath ) );
449 
   my $confFile;
 449 
   my $confFile;
450 
   if ( $confFile = &findFile( $$fileName, \@searchPath ) ) {
 450 
   if ( $confFile = &findFile( $$fileName, \@searchPath ) ) {
451 
      &logIt( 3, "Opening configuration from $confFile" );
 451 
      #&logIt( '', 3, "Opening configuration from $confFile" );
452 
      my $yaml = YAML::Tiny->read( $confFile );
 452 
      my $yaml = YAML::Tiny->read( $confFile );
453 
      &logIt( 4, "Configuration file contents\n$yaml" );
 453 
      #&logIt( '', 4, "Configuration file contents\n$yaml" );
454 
      $$fileName = $confFile;
 454 
      $$fileName = $confFile;
455 
      return $yaml->[0];
 455 
      return $yaml->[0];
456 
   }
 456 
   }
457 
   die "Can not find $fileName in any of " . join( "\n\t", @searchPath ) . "\n";
 457 
   die "Can not find $fileName in any of " . join( "\n\t", @searchPath ) . "\n";
458 
}
 458 
}
Line 467... Line 467...
467 
#         2 if priority > log level
 467 
#         2 if priority > log level
468 
#        -1 if $logDef is unset
 468 
#        -1 if $logDef is unset
469 
# currently, only logs to a file
 469 
# currently, only logs to a file
470 
#######################################################
 470 
#######################################################
471 
sub logIt {
 471 
sub logIt {
- 
 
 472 
   my $configuration = shift;
472 
   my $priority = shift;
 473 
   my $priority = shift;
473 
 
 474 
 
474 
   # turn off variable checking so it doesn't blow up on lack of %configuration file
 475 
   # turn off variable checking so it doesn't blow up on lack of %configuration file
475 
   no strict 'vars';
 476 
   #no strict 'vars';
476
- 
 
477 
   return -1 unless exists $configuration{'logging'};
 477 
   return -1 unless exists $configuration->{'logging'};
478 
   return 2 unless $priority <= $configuration{'logging'}{'log level'};
 478 
   return 2 unless $priority <= $configuration->{'logging'}->{'log level'};
479 
   if ( $configuration{'logging'}{'log type'} eq 'cache' ) {
 479 
   if ( $configuration->{'logging'}->{'log type'} eq 'cache' ) {
480 
      push @{ $configuration{'logging'}{'cache'} }, @_;
 480 
      push @{ $configuration->{'logging'}->{'cache'} }, @_;
481 
      return;
 481 
      return;
482 
   } elsif ( defined( $configuration{'logging'}{'cache'} ) ) {
 482 
   } elsif ( defined( $configuration->{'logging'}->{'cache'} ) ) {
483 
      unshift @_, @{ $configuration{'logging'}{'cache'} };
 483 
      unshift @_, @{ $configuration->{'logging'}->{'cache'} };
484 
      delete $configuration{'logging'}{'cache'};
 484 
      delete $configuration->{'logging'}->{'cache'};
485 
   }
 485 
   }
486 
   if ( $configuration{'logging'}{'log type'} eq 'file' ) {
 486 
   if ( $configuration->{'logging'}->{'log type'} eq 'file' ) {
487 
      if ( open LOG, '>>' . $configuration{'logging'}{'log path'} ) {
 487 
      if ( open LOG, '>>' . $configuration->{'logging'}->{'log path'} ) {
488 
         while ( my $t = shift ) {
 488 
         while ( my $t = shift ) {
489 
            print LOG &timeStamp() . "\t$t\n";
 489 
            print LOG &timeStamp() . "\t$t\n";
490 
         }
 490 
         }
491 
         close LOG;
 491 
         close LOG;
- 
 
 492 
      } else {
- 
 
 493 
         warn "Could not write to " . $configuration->{'logging'}->{'log path'} . "\n";
492 
      }
 494 
      }
493 
   } elsif ( $configuration{'logging'}{'log type'} eq 'syslog' ) {
 495 
   } elsif ( $configuration->{'logging'}->{'log type'} eq 'syslog' ) {
494 
      use Sys::Syslog;                        # all except setlogsock()
 496 
      use Sys::Syslog;                        # all except setlogsock()
495 
      use Sys::Syslog qw(:standard :macros);  # standard functions & macros
 497 
      use Sys::Syslog qw(:standard :macros);  # standard functions & macros
496 
 
 498 
 
497 
      my $syslogName = 'sysinfo-client';
 499 
      my $syslogName = 'sysinfo-client';
498 
      my $logopt = 'nofatal';
 500 
      my $logopt = 'nofatal';
Line 501... Line 503...
501 
 
 503 
 
502 
      openlog( $syslogName, $logopt, $facility);
 504 
      openlog( $syslogName, $logopt, $facility);
503 
      syslog($priority, '%s', @_ );
 505 
      syslog($priority, '%s', @_ );
504 
      closelog();
 506 
      closelog();
505 
   } else {
 507 
   } else {
506 
      warn "Log type $configuration{'logging'} incorrectly configured\n";
 508 
      warn "Log type $configuration->{'logging'} incorrectly configured\n";
507 
      return 0;
 509 
      return 0;
508 
   }
 510 
   }
509 
   return 1;
 511 
   return 1;
510 
}
 512 
}
511 
 
 513