Logging: Adapted the `logger' utility to the new numbering of levels.

[libucw.git] / ucw / log.c

diff --git a/ucw/log.c b/ucw/log.c
index c6a095be4b218cfb8af5728000c6903913fdfb96..5c4a006982f863b760e9309d34deb51eaaa05e09 100644 (file)
--- a/ucw/log.c
+++ b/ucw/log.c
@@ -219,7 +219,7 @@ log_pass_msg(int depth, struct log_stream *ls, struct log_msg *m)
   /* Process name, PID ( |log_title| + 6 + (|PID|<=10) chars ) */
   if ((ls->msgfmt & LSFMT_TITLE) && log_title)
     {
   /* Process name, PID ( |log_title| + 6 + (|PID|<=10) chars ) */
   if ((ls->msgfmt & LSFMT_TITLE) && log_title)
     {

-      if (ls->msgfmt & LSFMT_PID)
+      if ((ls->msgfmt & LSFMT_PID) && log_pid)

        p += sprintf(p, "[%s (%d)] ", log_title, log_pid);
       else
        p += sprintf(p, "[%s] ", log_title);
        p += sprintf(p, "[%s (%d)] ", log_title, log_pid);
       else
        p += sprintf(p, "[%s] ", log_title);


@@ -332,7 +332,7 @@ log_fork(void)
 
 int main(void)
 {
 
 int main(void)
 {

-  struct log_stream *ls = log_new_syslog(LOG_USER, "syslog");
+  struct log_stream *ls = log_new_syslog("local3", 0);

   msg(L_INFO | ls->regnum, "Brum <%300s>", ":-)");
   log_set_format(log_default_stream(), ~0U, LSFMT_USEC);
   msg(L_INFO, "Brum <%300s>", ":-)");
   msg(L_INFO | ls->regnum, "Brum <%300s>", ":-)");
   log_set_format(log_default_stream(), ~0U, LSFMT_USEC);
   msg(L_INFO, "Brum <%300s>", ":-)");