tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added fallback elsif (empty)

This commit is contained in:
Félix Suárez 2023-06-05 17:31:17 -06:00
parent 8e17ecf11b
commit a508d1f10d
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_agents/unix/pandora_agent
View File

@ -1423,6 +1423,9 @@ sub start_log (;$) {
# Open it # Open it
if ($Conf{'logfile'} eq 'syslog' && eval { Sys::Syslog->can('openlog') }) { if ($Conf{'logfile'} eq 'syslog' && eval { Sys::Syslog->can('openlog') }) {
openlog('pandora_agent', 'nowait', 'daemon'); openlog('pandora_agent', 'nowait', 'daemon');
} elsif($Conf{'logfile'} eq 'syslog') {
# Fallback if syslog is not available
} else { } else {
open ($LogFileFH, "> $Conf{'logfile'}") or error ("Could not open log file $Conf{'logfile'} for writing: $!."); open ($LogFileFH, "> $Conf{'logfile'}") or error ("Could not open log file $Conf{'logfile'} for writing: $!.");
print "Logging to $Conf{'logfile'}\n" if (!defined ($quiet)); print "Logging to $Conf{'logfile'}\n" if (!defined ($quiet));
@ -1433,10 +1436,10 @@ sub start_log (;$) {
# Rotates the agent logfile. # Rotates the agent logfile.
################################################################################ ################################################################################
sub rotate_log () { sub rotate_log () {
if ($Conf{'logfile'} eq 'syslog' && eval { Sys::Syslog->can('syslog') }) { if ($Conf{'logfile'} eq 'syslog') {
# No action needed # No action needed && no needed syslog fallback.
return; return;
} else { }else {
if ($Conf{'logrotate'} < 0){ if ($Conf{'logrotate'} < 0){
$Conf{'logrotate'} = DEFAULT_LOG_ROTATE; $Conf{'logrotate'} = DEFAULT_LOG_ROTATE;
} }
@ -1458,6 +1461,9 @@ sub rotate_log () {
sub stop_log () { sub stop_log () {
if ($Conf{'logfile'} eq 'syslog' && eval { Sys::Syslog->can('closelog') }) { if ($Conf{'logfile'} eq 'syslog' && eval { Sys::Syslog->can('closelog') }) {
closelog(); closelog();
} elsif($Conf{'logfile'} eq 'syslog') {
# Fallback if syslog is not available
} else { } else {
close ($LogFileFH); close ($LogFileFH);
} }
@ -1473,6 +1479,9 @@ sub log_message ($$;$) {
print $dest strftime ('%Y/%m/%d %H:%M:%S', localtime ()) . " - [$source] - $msg\n"; print $dest strftime ('%Y/%m/%d %H:%M:%S', localtime ()) . " - [$source] - $msg\n";
} elsif ($Conf{'logfile'} eq 'syslog' && eval { Sys::Syslog->can('syslog') }) { } elsif ($Conf{'logfile'} eq 'syslog' && eval { Sys::Syslog->can('syslog') }) {
syslog('info', $msg); syslog('info', $msg);
} elsif($Conf{'logfile'} eq 'syslog') {
# Fallback if syslog is not available
} else { } else {
#Trying to write into log file to test its writable #Trying to write into log file to test its writable
syswrite ($LogFileFH, ""); syswrite ($LogFileFH, "");