Changeset ae3dc99 for unix.c


Ignore:
Timestamp:
2010-04-24T17:02:07Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
c521362
Parents:
b5b40ff (diff), f1b7711 (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.
Message:

Merging stuff from mainline (1.2.6).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • unix.c

    rb5b40ff rae3dc99  
    8383       
    8484                i = bitlbee_inetd_init();
    85                 log_message( LOGLVL_INFO, "Bitlbee %s starting in inetd mode.", BITLBEE_VERSION );
     85                log_message( LOGLVL_INFO, "BitlBee %s starting in inetd mode.", BITLBEE_VERSION );
    8686
    8787        }
    8888        else if( global.conf->runmode == RUNMODE_DAEMON )
    8989        {
    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 );
    9292
    9393                i = bitlbee_daemon_init();
    94                 log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );
     94                log_message( LOGLVL_INFO, "BitlBee %s starting in daemon mode.", BITLBEE_VERSION );
    9595        }
    9696        else if( global.conf->runmode == RUNMODE_FORKDAEMON )
    9797        {
     98                log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE );
     99                log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE );
     100
    98101                /* In case the operator requests a restart, we need this. */
    99102                old_cwd = g_malloc( 256 );
     
    106109               
    107110                i = bitlbee_daemon_init();
    108                 log_message( LOGLVL_INFO, "Bitlbee %s starting in forking daemon mode.", BITLBEE_VERSION );
     111                log_message( LOGLVL_INFO, "BitlBee %s starting in forking daemon mode.", BITLBEE_VERSION );
    109112        }
    110113        if( i != 0 )
Note: See TracChangeset for help on using the changeset viewer.