Make no local logging a runtime option for network logging...

This commit is contained in:
Eric Andersen 2000-12-08 19:52:01 +00:00
parent 76fef0a5d0
commit bf2b8ae49a
6 changed files with 65 additions and 51 deletions

View File

@ -1176,6 +1176,7 @@ const char syslogd_usage[] =
"\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n"
#ifdef BB_FEATURE_REMOTE_LOG
"\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n"
"\t-N\t\tDo not log anything locally -- network logging only.\n"
#endif
#endif
;

View File

@ -1707,6 +1707,7 @@ Options:
-K Do not start up the klogd process
-O FILE Use an alternate log file (default=/var/log/messages)
-R HOST[:PORT] Log messages to HOST on PORT (default=514) over UDP.
-N Do not log anything locally -- network logging only
Example:
@ -2261,4 +2262,4 @@ Enrique Zanardi <ezanardi@ull.es>
=cut
# $Id: busybox.pod,v 1.77 2000/11/17 17:23:16 andersen Exp $
# $Id: busybox.pod,v 1.78 2000/12/08 19:52:01 andersen Exp $

View File

@ -2991,6 +2991,7 @@
-K Do not start up the klogd process
-O FILE Use an alternate log file (default=/var/log/messages)
-R HOST[:PORT] Log messages to HOST on PORT (default=514) over UDP.
-N Do not log anything locally -- network logging only
</screen>
</para>

View File

@ -86,6 +86,7 @@ static char *RemoteHost;
static int RemotePort = 514;
/* To remote log or not to remote log, that is the question. */
static int doRemoteLog = FALSE;
static int local_logging = TRUE;
#endif
/* Note: There is also a function called "message()" in init.c */
@ -181,7 +182,8 @@ 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
}
if (local_logging == TRUE)
#endif
/* now spew out the message to wherever it is supposed to go */
message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
@ -529,6 +531,9 @@ extern int syslogd_main(int argc, char **argv)
doRemoteLog = TRUE;
stopDoingThat = TRUE;
break;
case 'N':
local_logging = FALSE;
break;
#endif
default:
usage(syslogd_usage);

View File

@ -86,6 +86,7 @@ static char *RemoteHost;
static int RemotePort = 514;
/* To remote log or not to remote log, that is the question. */
static int doRemoteLog = FALSE;
static int local_logging = TRUE;
#endif
/* Note: There is also a function called "message()" in init.c */
@ -181,7 +182,8 @@ 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
}
if (local_logging == TRUE)
#endif
/* now spew out the message to wherever it is supposed to go */
message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
@ -529,6 +531,9 @@ extern int syslogd_main(int argc, char **argv)
doRemoteLog = TRUE;
stopDoingThat = TRUE;
break;
case 'N':
local_logging = FALSE;
break;
#endif
default:
usage(syslogd_usage);

View File

@ -1176,6 +1176,7 @@ const char syslogd_usage[] =
"\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n"
#ifdef BB_FEATURE_REMOTE_LOG
"\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n"
"\t-N\t\tDo not log anything locally -- network logging only.\n"
#endif
#endif
;