Patch from Bastian Blank:

Hi folks

    The following patch adds a new log message output to syslogd. This
    output omits hostname and priority and is used in d-i to make the syslog
    output better readable without lossing information.

    Bastian

I am applying this since I have syslogd hacked up in my wife's
access point with the same format string....  Might as well make
this hack official.
 -Erik
This commit is contained in:
Eric Andersen 2004-06-22 10:12:59 +00:00
parent 36adca81f5
commit 7f94a5caa2

View File

@ -35,6 +35,7 @@
#include <paths.h> #include <paths.h>
#include <signal.h> #include <signal.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdbool.h>
#include <time.h> #include <time.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@ -88,6 +89,9 @@ static int doRemoteLog = FALSE;
static int local_logging = FALSE; static int local_logging = FALSE;
#endif #endif
/* Make loging output smaller. */
static bool small = false;
#define MAXLINE 1024 /* maximum line length */ #define MAXLINE 1024 /* maximum line length */
@ -428,8 +432,13 @@ static void logMessage(int pri, char *msg)
} }
if (local_logging == TRUE) if (local_logging == TRUE)
#endif #endif
{
/* now spew out the message to wherever it is supposed to go */ /* now spew out the message to wherever it is supposed to go */
message("%s %s %s %s\n", timestamp, LocalHostName, res, msg); if (small)
message("%s %s\n", timestamp, msg);
else
message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
}
} }
static void quit_signal(int sig) static void quit_signal(int sig)
@ -666,6 +675,9 @@ extern int syslogd_main(int argc, char **argv)
circular_logging = TRUE; circular_logging = TRUE;
break; break;
#endif #endif
case 'S':
small = true;
break;
default: default:
bb_show_usage(); bb_show_usage();
} }