From ce9430d28040de02d3f3e31e1b8f17b804aa7e43 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 2 Jul 2015 14:58:53 +0800 Subject: [PATCH] Fix sourceforge bug #4691 Use a consistent log tag for xCAT log --- perl-xCAT/xCAT/MsgUtils.pm | 6 +++--- src/proxydhcp.c | 6 +----- xCAT-UI/lib/functions.php | 2 +- xCAT-UI/lib/srv_functions.php | 2 +- xCAT-server/lib/xcat/plugins/nodediscover.pm | 2 +- xCAT-server/sbin/proxydhcp-xcat | 2 +- xCAT-server/sbin/xcat_traphandler | 2 +- xCAT-server/sbin/xcatd | 6 +++--- xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl | 2 +- xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd.pl | 2 +- xCAT/postscripts/confGang | 2 -- 11 files changed, 14 insertions(+), 20 deletions(-) diff --git a/perl-xCAT/xCAT/MsgUtils.pm b/perl-xCAT/xCAT/MsgUtils.pm index 71b8ea4cd..0e9cd3028 100644 --- a/perl-xCAT/xCAT/MsgUtils.pm +++ b/perl-xCAT/xCAT/MsgUtils.pm @@ -470,7 +470,7 @@ sub message { # If they want this msg to also go to syslog, do that now eval { - openlog("xCAT", "nofatal,pid", "local4"); + openlog("xcat", "nofatal,pid", "local4"); if ($sev eq 'SE') { syslog("err", $rsp); } else { @@ -516,7 +516,7 @@ sub message { print $stdouterrf "Unable to open auditlog\n"; eval { - openlog("xCAT", "nofatal,pid", "local4"); + openlog("xcat", "nofatal,pid", "local4"); syslog("err", "Unable to write to auditlog"); closelog(); }; @@ -533,7 +533,7 @@ sub message { # error print $stdouterrf "Unable to open auditlog\n"; eval { - openlog("xCAT", "nofatal,pid", "local4"); + openlog("xcat", "nofatal,pid", "local4"); syslog("err", "Unable to open auditlog"); closelog(); }; diff --git a/src/proxydhcp.c b/src/proxydhcp.c index cc9a265a3..745707619 100644 --- a/src/proxydhcp.c +++ b/src/proxydhcp.c @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) { if (strcmp(argv[i], "-V") == 0) { verbose = 1; setlogmask(LOG_UPTO(LOG_DEBUG)); - openlog("proxydhcp", LOG_NDELAY, LOG_LOCAL0); + openlog("xcat", LOG_NDELAY, LOG_LOCAL0); } } @@ -276,7 +276,3 @@ int main(int argc, char *argv[]) { if (verbose) { closelog();} } - - - - diff --git a/xCAT-UI/lib/functions.php b/xCAT-UI/lib/functions.php index 51827fc4e..a59e44eef 100644 --- a/xCAT-UI/lib/functions.php +++ b/xCAT-UI/lib/functions.php @@ -81,7 +81,7 @@ function submit_request($req, $skipVerify, $opts_array){ // Open syslog, include the process ID and also send the log to standard error, // and use a user defined logging mechanism - openlog("xCAT-UI", LOG_PID | LOG_PERROR, LOG_LOCAL0); + openlog("xcat", LOG_PID | LOG_PERROR, LOG_LOCAL0); // Open a socket to xcatd syslog(LOG_INFO, "Opening socket to xcatd..."); diff --git a/xCAT-UI/lib/srv_functions.php b/xCAT-UI/lib/srv_functions.php index 6dafe540e..161af8ecc 100644 --- a/xCAT-UI/lib/srv_functions.php +++ b/xCAT-UI/lib/srv_functions.php @@ -79,7 +79,7 @@ function submit_request($req, $skipVerify, $opts_array){ // Open syslog, include the process ID and also send // the log to standard error, and use a user defined // logging mechanism - openlog("xCAT-UI", LOG_PID | LOG_PERROR, LOG_LOCAL0); + openlog("xcat", LOG_PID | LOG_PERROR, LOG_LOCAL0); // Open a socket to xcatd syslog(LOG_INFO, "Opening socket to xcatd..."); diff --git a/xCAT-server/lib/xcat/plugins/nodediscover.pm b/xCAT-server/lib/xcat/plugins/nodediscover.pm index 25d49504a..86f582b51 100644 --- a/xCAT-server/lib/xcat/plugins/nodediscover.pm +++ b/xCAT-server/lib/xcat/plugins/nodediscover.pm @@ -137,7 +137,7 @@ sub process_request { my $doreq = shift; my $node = $request->{node}->[0]; my $clientip = $request->{'_xcat_clientip'}; - openlog("xCAT node discovery",'','local0'); + openlog("xcat",'','local0'); #First, fill in tables with data fields.. diff --git a/xCAT-server/sbin/proxydhcp-xcat b/xCAT-server/sbin/proxydhcp-xcat index e64331be4..91fae26fa 100755 --- a/xCAT-server/sbin/proxydhcp-xcat +++ b/xCAT-server/sbin/proxydhcp-xcat @@ -34,7 +34,7 @@ if ($tobedaemon) { } # open syslog -openlog("proxydhcp", "nofatal", "local4"); +openlog("xcat", "nofatal", "local4"); my $socket; my $retry = 5; diff --git a/xCAT-server/sbin/xcat_traphandler b/xCAT-server/sbin/xcat_traphandler index 49d281e19..c5c9a3350 100755 --- a/xCAT-server/sbin/xcat_traphandler +++ b/xCAT-server/sbin/xcat_traphandler @@ -306,7 +306,7 @@ if ($LOG || (keys(%hashL)==0)) { if ($briefmsg) { $body=$briefmsg;} else { $body=$message; } - openlog("xCATMon Event","","local4"); + openlog("xcat","","local4"); if ($severity_type eq "Informational") { syslog("local4|info", "$head\n$body\n"); } else { diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd index 0ea124fa1..9670055a7 100755 --- a/xCAT-server/sbin/xcatd +++ b/xCAT-server/sbin/xcatd @@ -110,7 +110,7 @@ use xCAT::ExtTab; use Data::Dumper; use Getopt::Long; use Sys::Syslog qw(:DEFAULT setlogsock); -openlog("xcatd",,"local4"); +openlog("xcat",,"local4"); # turn off warnings for call to setlogsock. puts out warning message if # syslog tcp port not defined in /etc/services. this can safely be ignored. no warnings; @@ -671,7 +671,7 @@ sub do_udp_service { #This function opens up a UDP port sleep 0.05; } - openlog("xCAT UDP",'','local4'); + openlog("xcat",'','local4'); unless ($socket) { xCAT::MsgUtils->message("S","xCAT UDP service unable to open port $port: $!"); closelog(); @@ -1050,7 +1050,7 @@ $chrselect->add($chreadpipe); my $peername; my $ssltimeout; my $retry=1; -openlog("xCAT SSL","","local4"); +openlog("xcat","","local4"); my $listener; my $mainpidfile; $SIG{USR2} = sub { diff --git a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl index d98426425..cc60e745b 100755 --- a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl +++ b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl @@ -124,7 +124,7 @@ sub logger { my $msg = shift; setlogsock('unix'); - openlog('autogpfsc','','local0'); + openlog('xcat','','local0'); syslog($type,$msg); closelog(); } diff --git a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd.pl b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd.pl index bbee72f31..d0e9e93f9 100755 --- a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd.pl +++ b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd.pl @@ -369,7 +369,7 @@ sub logger { my $msg = shift; setlogsock('unix'); - openlog('autogpfsd','','local0'); + openlog('xcat','','local0'); syslog($type,$msg); closelog(); diff --git a/xCAT/postscripts/confGang b/xCAT/postscripts/confGang index 96814e8ab..bfa4a97d8 100755 --- a/xCAT/postscripts/confGang +++ b/xCAT/postscripts/confGang @@ -116,13 +116,11 @@ fi if [ ! -f $gmond_conf ]; then # echo "file not found" - logger -t gmonfail "gmond configuration file not found" logger -t xcat -p local4.warning "gmond configuration file not found" fi if [ ! -f $gmond_conf_old ]; then # echo "file not found" - logger -t gmonfail "gmond configuration file not found" logger -t xcat -p local4.warning "gmond configuration file not found" fi