Changeset 156bbd7

Timestamp:

2010-04-13T23:55:30Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

21c87a7, f9ed311

Parents:

c0417e8

Message:

Log to stderr+syslog until daemonized. Current behaviour is too confusing
and annoying.

Files:

• bitlbee.c (modified) (2 diffs)
• log.c (modified) (1 diff)
• unix.c (modified) (2 diffs)

bitlbee.c

@@ -42 +42 @@
         FILE *fp;
         
-        log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
-        log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
+        log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE );
+        log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE );
         
         memset( &hints, 0, sizeof( hints ) );
@@ -146 +146 @@
 #endif
         
+        if( !global.conf->nofork )
+        {
+                log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
+        }
+        
         return( 0 );
 }

log.c

@@ -172 +172 @@
                 fprintf(stdout, "Debug: %s\n", message);
 #endif
+        /* Always log stuff in syslogs too. */
+        log_syslog(level, message);
         return;
 }

unix.c

@@ -73 +73 @@
         
                 i = bitlbee_inetd_init();
-                log_message( LOGLVL_INFO, "Bitlbee %s starting in inetd mode.", BITLBEE_VERSION );
+                log_message( LOGLVL_INFO, "BitlBee %s starting in inetd mode.", BITLBEE_VERSION );
 
         }
         else if( global.conf->runmode == RUNMODE_DAEMON )
         {
-                log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
-                log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
+                log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE );
 
                 i = bitlbee_daemon_init();
-                log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );
+                log_message( LOGLVL_INFO, "BitlBee %s starting in daemon mode.", BITLBEE_VERSION );
         }
         else if( global.conf->runmode == RUNMODE_FORKDAEMON )
         {
+                log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE );
+
                 /* In case the operator requests a restart, we need this. */
                 old_cwd = g_malloc( 256 );
@@ -96 +99 @@
                 
                 i = bitlbee_daemon_init();
-                log_message( LOGLVL_INFO, "Bitlbee %s starting in forking daemon mode.", BITLBEE_VERSION );
+                log_message( LOGLVL_INFO, "BitlBee %s starting in forking daemon mode.", BITLBEE_VERSION );
         }
         if( i != 0 )