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

Now correctly differentiates between options and priority/facilities.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5334 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2003-11-12 16:34:12 +00:00
parent fa2f787a47
commit 87a98412a1
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/kernel/libroot/posix/syslog.cpp
View File

@ -16,14 +16,16 @@
struct syslog_context { struct syslog_context {
char ident[B_OS_NAME_LENGTH]; char ident[B_OS_NAME_LENGTH];
int32 mask; int16 mask;
int16 facility;
int32 options; int32 options;
}; };
static syslog_context sTeamContext = { static syslog_context sTeamContext = {
"", "",
-1, -1,
0 LOG_USER,
LOG_CONS
}; };
static int32 sThreadContextSlot = -1; static int32 sThreadContextSlot = -1;
@ -96,13 +98,14 @@ get_context()
*/ */
static void static void
send_syslog_message(syslog_context *context, int options, const char *text, va_list args) send_syslog_message(syslog_context *context, int priority, const char *text, va_list args)
{ {
int options = context->options;
// do we have to do anything? // do we have to do anything?
if ((context->mask & LOG_MASK(SYSLOG_PRIORITY(options))) == 0) if ((context->mask & LOG_MASK(SYSLOG_PRIORITY(priority))) == 0)
return; return;
options |= context->options;
port_id port = find_port(SYSLOG_PORT_NAME); port_id port = find_port(SYSLOG_PORT_NAME);
if ((options & LOG_PERROR) != 0 if ((options & LOG_PERROR) != 0
@ -127,6 +130,7 @@ send_syslog_message(syslog_context *context, int options, const char *text, va_l
message.from = find_thread(NULL); message.from = find_thread(NULL);
message.when = real_time_clock(); message.when = real_time_clock();
message.options = options; message.options = options;
message.priority = priority | context->facility;
strcpy(message.ident, context->ident); strcpy(message.ident, context->ident);
int length = vsnprintf(message.message, sizeof(buffer) - sizeof(syslog_message), text, args); int length = vsnprintf(message.message, sizeof(buffer) - sizeof(syslog_message), text, args);
@ -154,7 +158,8 @@ openlog_team(const char *ident, int options, int facility)
if (ident != NULL) if (ident != NULL)
strcpy(sTeamContext.ident, ident); strcpy(sTeamContext.ident, ident);
sTeamContext.options = facility | options; sTeamContext.options = options;
sTeamContext.facility = SYSLOG_FACILITY(facility);
} }
@ -200,7 +205,8 @@ openlog_thread(const char *ident, int options, int facility)
if (ident) if (ident)
strcpy(context->ident, ident); strcpy(context->ident, ident);
context->options = options | facility; context->options = options;
context->facility = SYSLOG_FACILITY(facility);
} }