diff options
| author | Sven Moritz Hallberg <pesco@khjk.org> | 2010-06-03 13:00:45 +0200 |
|---|---|---|
| committer | Sven Moritz Hallberg <pesco@khjk.org> | 2010-06-03 13:00:45 +0200 |
| commit | 814aa52228c7cad1d036c1a6dc5ea03cce61c048 (patch) | |
| tree | 7db06b9191f00b086f25789a0a040d15cef580cf /unix.c | |
| parent | 5f8ab6a9adf09ea7c07f728227bdb6d3953588f1 (diff) | |
| parent | f4bcc223fea70de8555bbc4d2caf48e0476c0e13 (diff) | |
merge in bitlbee 1.2.6
Diffstat (limited to 'unix.c')
| -rw-r--r-- | unix.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -82,19 +82,22 @@ int main( int argc, char *argv[] ) log_link( LOGLVL_WARNING, LOGOUTPUT_IRC ); 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 ); if( getcwd( old_cwd, 255 ) == NULL ) @@ -105,7 +108,7 @@ int main( int argc, char *argv[] ) } 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 ) return( i ); |