Changeset 8e419cb for unix.c

Timestamp:

2006-01-10T21:35:08Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

a4dc9f7

Parents:

3e91c3e (diff), dd8d4c5 (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:

Merge Wilmer

File:

• unix.c (modified) (6 diffs)

unix.c

@@ -32 +32 @@
 #include <unistd.h>
 #include <sys/time.h>
+#include <sys/wait.h>
 
 global_t global;        /* Against global namespace pollution */
@@ -46 +47 @@
         global.loop = g_main_new( FALSE );
         
-        log_init( );
+        log_init();
 
         nogaim_init();
@@ -76 +77 @@
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );
         }
+        else if( global.conf->runmode == RUNMODE_FORKDAEMON )
+        {
+                i = bitlbee_daemon_init();
+                log_message( LOGLVL_INFO, "Bitlbee %s starting in forking daemon mode.", BITLBEE_VERSION );
+        }
         if( i != 0 )
                 return( i );
 
-        global.storage = storage_init( global.conf->primary_storage, 
-                                                                   global.conf->migrate_storage );
+        global.storage = storage_init( global.conf->primary_storage, global.conf->migrate_storage );
         if ( global.storage == NULL) {
                 log_message( LOGLVL_ERROR, "Unable to load storage backend '%s'", global.conf->primary_storage );
@@ -90 +95 @@
         memset( &sig, 0, sizeof( sig ) );
         sig.sa_handler = sighandler;
+        sigaction( SIGCHLD, &sig, &old );
         sigaction( SIGPIPE, &sig, &old );
         sig.sa_flags = SA_RESETHAND;
@@ -113 +119 @@
 static void sighandler( int signal )
 {
-        /* FIXME: In fact, calling log_message() here can be dangerous. But well, let's take the risk for now. */
+        /* FIXME: Calling log_message() here is not a very good idea! */
         
         if( signal == SIGTERM )
@@ -139 +145 @@
                 }
         }
+        else if( signal == SIGCHLD )
+        {
+                pid_t pid;
+                int st;
+                
+                while( ( pid = waitpid( 0, &st, WNOHANG ) ) > 0 )
+                {
+                        if( WIFSIGNALED( st ) )
+                                log_message( LOGLVL_INFO, "Client %d terminated normally. (status = %d)", pid, WEXITSTATUS( st ) );
+                        else if( WIFEXITED( st ) )
+                                log_message( LOGLVL_INFO, "Client %d killed by signal %d.", pid, WTERMSIG( st ) );
+                }
+        }
         else if( signal != SIGPIPE )
         {