Patch from Gennady Feldman <gfeldman@mail.com> to make syslogd not log

when compiled for remote logging.  Not the ideal way to fix it (it should
really be a runtime switch), but good enough for now I guess...
This commit is contained in:
Eric Andersen 2000-12-08 19:41:21 +00:00
parent 9cff4fbac9
commit 76fef0a5d0
3 changed files with 10 additions and 8 deletions

View File

@ -46,6 +46,8 @@
* Jim Gleason <jimg@lineo.com> -- fixed tar so it no longer breaks
hard links.
* Matt Kraai -- logger now logs all arguments, not just the first
* Gennady Feldman -- syslogd no longer logs to localhost if compiled
for remote logging...
-Erik Andersen

View File

@ -161,9 +161,6 @@ static void logMessage (int pri, char *msg)
/* todo: supress duplicates */
/* now spew out the message to wherever it is supposed to go */
message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
#ifdef BB_FEATURE_REMOTE_LOG
/* send message to remote logger */
if ( -1 != remotefd){
@ -184,8 +181,11 @@ static void logMessage (int pri, char *msg)
error_msg_and_die("syslogd: cannot write to remote file handle on"
"%s:%d\n",RemoteHost,RemotePort);
}
}
} else
#endif
/* now spew out the message to wherever it is supposed to go */
message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
}

View File

@ -161,9 +161,6 @@ static void logMessage (int pri, char *msg)
/* todo: supress duplicates */
/* now spew out the message to wherever it is supposed to go */
message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
#ifdef BB_FEATURE_REMOTE_LOG
/* send message to remote logger */
if ( -1 != remotefd){
@ -184,8 +181,11 @@ static void logMessage (int pri, char *msg)
error_msg_and_die("syslogd: cannot write to remote file handle on"
"%s:%d\n",RemoteHost,RemotePort);
}
}
} else
#endif
/* now spew out the message to wherever it is supposed to go */
message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
}