- Timestamp:
- 2010-06-03T11:00:45Z (14 years ago)
- Branches:
- master
- Children:
- a6b2f13
- Parents:
- 5f8ab6a9 (diff), f4bcc22 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
unix.c
r5f8ab6a9 r814aa52 83 83 84 84 i = bitlbee_inetd_init(); 85 log_message( LOGLVL_INFO, "Bitl bee %s starting in inetd mode.", BITLBEE_VERSION );85 log_message( LOGLVL_INFO, "BitlBee %s starting in inetd mode.", BITLBEE_VERSION ); 86 86 87 87 } 88 88 else if( global.conf->runmode == RUNMODE_DAEMON ) 89 89 { 90 log_link( LOGLVL_ERROR, LOGOUTPUT_ SYSLOG);91 log_link( LOGLVL_WARNING, LOGOUTPUT_ SYSLOG);90 log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE ); 91 log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE ); 92 92 93 93 i = bitlbee_daemon_init(); 94 log_message( LOGLVL_INFO, "Bitl bee %s starting in daemon mode.", BITLBEE_VERSION );94 log_message( LOGLVL_INFO, "BitlBee %s starting in daemon mode.", BITLBEE_VERSION ); 95 95 } 96 96 else if( global.conf->runmode == RUNMODE_FORKDAEMON ) 97 97 { 98 log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE ); 99 log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE ); 100 98 101 /* In case the operator requests a restart, we need this. */ 99 102 old_cwd = g_malloc( 256 ); … … 106 109 107 110 i = bitlbee_daemon_init(); 108 log_message( LOGLVL_INFO, "Bitl bee %s starting in forking daemon mode.", BITLBEE_VERSION );111 log_message( LOGLVL_INFO, "BitlBee %s starting in forking daemon mode.", BITLBEE_VERSION ); 109 112 } 110 113 if( i != 0 )
Note: See TracChangeset
for help on using the changeset viewer.