Changeset 72d48b6

Timestamp:

2016-05-01T03:27:28Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

4fe91a1

Parents:

720f7a9

Message:

unix.c: Move log_link() calls before plugin initialization

This ensures that plugin load errors are logged instead of thrown away

File:

• unix.c (modified) (2 diffs)

unix.c

@@ -80 +80 @@
         }
 
+        if (global.conf->runmode == RUNMODE_INETD) {
+                log_link(LOGLVL_ERROR, LOGOUTPUT_IRC);
+                log_link(LOGLVL_WARNING, LOGOUTPUT_IRC);
+        } else {
+                log_link(LOGLVL_ERROR, LOGOUTPUT_CONSOLE);
+                log_link(LOGLVL_WARNING, LOGOUTPUT_CONSOLE);
+        }
+
         b_main_init();
 
@@ -111 +119 @@
 
         if (global.conf->runmode == RUNMODE_INETD) {
-                log_link(LOGLVL_ERROR, LOGOUTPUT_IRC);
-                log_link(LOGLVL_WARNING, LOGOUTPUT_IRC);
-
                 i = bitlbee_inetd_init();
                 log_message(LOGLVL_INFO, "%s %s starting in inetd mode.", PACKAGE, BITLBEE_VERSION);
 
         } else if (global.conf->runmode == RUNMODE_DAEMON) {
-                log_link(LOGLVL_ERROR, LOGOUTPUT_CONSOLE);
-                log_link(LOGLVL_WARNING, LOGOUTPUT_CONSOLE);
-
                 i = bitlbee_daemon_init();
                 log_message(LOGLVL_INFO, "%s %s starting in daemon mode.", PACKAGE, 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);