rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-07-27 20:55:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix syslog() priority handling

Browse Source 
Ths syslog priority is a mask not a level.
This commit is contained in:
Sebastian Huber 2018-10-10 11:37:37 +02:00
parent 1e77a45d54
commit f949b432de
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
rtemsbsd/rtems/syslog.c
View File

@ -7,7 +7,7 @@
*/ */
/* /*
* Copyright (c) 2014, 2016 embedded brains GmbH. All rights reserved. * Copyright (c) 2014, 2018 embedded brains GmbH. All rights reserved.
* *
* embedded brains GmbH * embedded brains GmbH
* Dornierstr. 4 * Dornierstr. 4
@ -46,12 +46,20 @@
#include <rtems/bsd/bsd.h> #include <rtems/bsd/bsd.h>
static int syslog_priority = LOG_NOTICE; static int syslog_mask = LOG_UPTO(LOG_NOTICE);
static bool
syslog_do_log(int priority)
{
return (((LOG_MASK(LOG_PRI(priority)) & syslog_mask)) != 0);
}
void void
syslog(int priority, const char *format, ...) syslog(int priority, const char *format, ...)
{ {
if (priority <= syslog_priority) {
if (syslog_do_log(priority)) {
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
@ -63,7 +71,8 @@ syslog(int priority, const char *format, ...)
void void
vsyslog(int priority, const char *format, va_list ap) vsyslog(int priority, const char *format, va_list ap)
{ {
if (priority <= syslog_priority) {
if (syslog_do_log(priority)) {
rtems_bsd_vprintf(priority, format, ap); rtems_bsd_vprintf(priority, format, ap);
} }
} }
@ -83,20 +92,31 @@ closelog(void)
int int
setlogmask(int mask) setlogmask(int mask)
{ {
/* TODO */
/*
* Ignore settings via this function since it has a process-wide scope.
* System services (a DHCP client daemon for example) may set this and
* assume that they run in their own environment (process). This is
* not the case in RTEMS. The syslog mask can be set via
* rtems_bsd_setlogpriority().
*/
return (0);
} }
int int
rtems_bsd_setlogpriority(const char *priority) rtems_bsd_setlogpriority(const char *priority)
{ {
CODE* c = &prioritynames[0]; const CODE *c;
c = &prioritynames[0];
while (c->c_name != NULL) { while (c->c_name != NULL) {
if (strcasecmp(c->c_name, priority) == 0) { if (strcasecmp(c->c_name, priority) == 0) {
syslog_priority = c->c_val; syslog_mask = LOG_UPTO(c->c_val);
return 0; return (0);
} }
++c; ++c;
} }
errno = ENOENT; errno = ENOENT;
return -1; return (-1);
} }