aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-08-02 11:16:04 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-08-02 11:16:04 +0100
commitd7ac3b29bdc901b867007550a2bbdcc0fce03fe9 (patch)
tree8ca349531192e595fe5072a756842a0edf1425fa
parentdf6c652a15f43c187de52e57735e250ccd2c0b47 (diff)
downloadxen-d7ac3b29bdc901b867007550a2bbdcc0fce03fe9.tar.gz
xen-d7ac3b29bdc901b867007550a2bbdcc0fce03fe9.tar.bz2
xen-d7ac3b29bdc901b867007550a2bbdcc0fce03fe9.zip
Before this patch only log messages with precisely priority
LOG_WARNING (or precisely LOG_DEBUG if -v) would be logged. xenconsoled only actually logs using LOG_ERR and LOG_DEBUG so for the most part we would have been logging absolutely nothing up until now. Linux provides a LOG_UPTO macro but I'm not sure how portable that is so I have opencoded the list of levels. Do I get some sort of prize for fixing a bug introduced in 2005? Signed-off-by: Ian Campbell <ian.campbell@citrix.com> xen-unstable changeset: 21814:91ce0b0953ca xen-unstable date: Fri Jul 16 12:10:56 2010 +0100
-rw-r--r--tools/console/daemon/main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c
index 60faa4bb2a..789baa6c23 100644
--- a/tools/console/daemon/main.c
+++ b/tools/console/daemon/main.c
@@ -73,7 +73,8 @@ int main(int argc, char **argv)
bool is_interactive = false;
int ch;
int syslog_option = LOG_CONS;
- int syslog_mask = LOG_WARNING;
+ int syslog_mask = LOG_MASK(LOG_WARNING)|LOG_MASK(LOG_ERR)|LOG_MASK(LOG_CRIT)|\
+ LOG_MASK(LOG_ALERT)|LOG_MASK(LOG_EMERG);
int opt_ind = 0;
char *pidfile = NULL;
@@ -89,7 +90,8 @@ int main(int argc, char **argv)
#ifndef __sun__
syslog_option |= LOG_PERROR;
#endif
- syslog_mask = LOG_DEBUG;
+ syslog_mask |= LOG_MASK(LOG_NOTICE)|LOG_MASK(LOG_INFO)| \
+ LOG_MASK(LOG_DEBUG);
break;
case 'i':
is_interactive = true;