Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made maximum syslog size and inclusion of timestamps configureable in kernel settings.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20905 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen 2007-04-29 17:06:54 +00:00
parent f7c789146d
commit e27964028e
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/servers/syslog_daemon/syslog_output.cpp
View File

@ -8,16 +8,16 @@
#include <FindDirectory.h> #include <FindDirectory.h>
#include <Path.h> #include <Path.h>
#include <driver_settings.h>
#include <syslog.h> #include <syslog.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
static const size_t kMaxLogSize = 524288; // 512kB
static const char *kFacilities[] = { static const char *kFacilities[] = {
"KERN", "USER", "MAIL", "DAEMON", "KERN", "USER", "MAIL", "DAEMON",
"AUTH", "SYSLOGD", "LPR", "NEWS", "AUTH", "SYSLOGD", "LPR", "NEWS",
@ -29,10 +29,12 @@ static const char *kFacilities[] = {
}; };
static const int32 kNumFacilities = 24; static const int32 kNumFacilities = 24;
int sLog = -1; static int sLog = -1;
char sLastMessage[1024]; static char sLastMessage[1024];
thread_id sLastThread; static thread_id sLastThread;
int32 sRepeatCount; static int32 sRepeatCount;
static size_t sLogMaxSize = 524288; // 512kB
static bool sLogTimeStamps = false;
/*! /*!
@ -49,7 +51,7 @@ prepare_output()
// check file size // check file size
struct stat stat; struct stat stat;
if (fstat(sLog, &stat) == 0) { if (fstat(sLog, &stat) == 0) {
if (stat.st_size < kMaxLogSize) if (stat.st_size < sLogMaxSize)
needNew = false; needNew = false;
else else
tooLarge = true; tooLarge = true;
@ -118,15 +120,14 @@ syslog_output(syslog_message &message)
{ {
char header[128]; char header[128];
int32 headerLength; int32 headerLength;
#if 0
// parse & nicely print the time stamp from the message
struct tm when;
localtime_r(&message.when, &when);
int32 pos = strftime(buffer, sizeof(buffer), "%b %d, %H:%M:%S ", &when);
#else
int32 pos = 0; int32 pos = 0;
#endif
if (sLogTimeStamps) {
// parse & nicely print the time stamp from the message
struct tm when;
localtime_r(&message.when, &when);
pos = strftime(header, sizeof(header), "%Y-%m-%d %H:%M:%S", &when);
}
// add facility // add facility
int facility = SYSLOG_FACILITY_INDEX(message.priority); int facility = SYSLOG_FACILITY_INDEX(message.priority);
@ -202,6 +203,26 @@ syslog_output(syslog_message &message)
void void
init_syslog_output(SyslogDaemon *daemon) init_syslog_output(SyslogDaemon *daemon)
{ {
void *handle;
// get kernel syslog settings
handle = load_driver_settings("kernel");
if (handle != NULL) {
sLogTimeStamps = get_driver_boolean_parameter(handle,
"syslog_time_stamps", false, false);
const char *param = get_driver_parameter(handle,
"syslog_max_size", "0", "0");
int maxSize = strtol(param, NULL, 0);
if (strchr(param, 'k') || strchr(param, 'K'))
maxSize *= 1024;
else if (strchr(param, 'm') || strchr(param, 'M'))
maxSize *= 1048576;
if (maxSize > 0)
sLogMaxSize = maxSize;
unload_driver_settings(handle);
}
daemon->AddHandler(syslog_output); daemon->AddHandler(syslog_output);
} }