X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=09087f7a72396bf01e51782dbebc1b9d1a82eb7c;hp=6370cefd086d8351f91e25c411142ba8fea4f65a;hb=8af63afe0ce633fd488f0669614e2d08680f90bc;hpb=52cb435d3d628d27fa781b31519470eb5ef70a4a

diff --git a/server.c b/server.c
index 6370cefd..09087f7a 100644
--- a/server.c
+++ b/server.c
@@ -110,7 +110,7 @@ static struct signal_task *signal_task;
 /** The process id of the audio file selector process. */
 pid_t afs_pid = 0;
 
-/* The the main server process (parent of afs and the command handlers). */
+/* The main server process (parent of afs and the command handlers). */
 static pid_t server_pid;
 
 /**
@@ -298,14 +298,14 @@ static int signal_post_select(struct sched *s, __a_unused void *context)
 			if (pid != afs_pid)
 				continue;
 			PARA_EMERG_LOG("fatal: afs died\n");
-			kill(0, SIGTERM);
-			goto cleanup;
+			goto genocide;
 		}
 		break;
 	/* die on sigint/sigterm. Kill all children too. */
 	case SIGINT:
 	case SIGTERM:
 		PARA_EMERG_LOG("terminating on signal %d\n", signum);
+genocide:
 		kill(0, SIGTERM);
 		/*
 		 * We must wait for all of our children to die. For the afs
@@ -320,7 +320,6 @@ static int signal_post_select(struct sched *s, __a_unused void *context)
 		while (wait(NULL) != -1 || errno != ECHILD)
 			; /* still at least one child alive */
 		mutex_lock(mmd_mutex);
-cleanup:
 		free(mmd->afd.afhi.chunk_table);
 		task_notify_all(s, E_DEADLY_SIGNAL);
 		return -E_DEADLY_SIGNAL;
@@ -583,9 +582,6 @@ static void server_init(int argc, char **argv, struct server_command_task *sct)
 	init_ipc_or_die(); /* init mmd struct, mmd and log mutex */
 	daemon_set_start_time();
 	daemon_set_hooks(pre_log_hook, post_log_hook);
-	PARA_NOTICE_LOG("initializing audio format handlers\n");
-	afh_init();
-
 	/*
 	 * Although afs uses its own signal handling we must ignore SIGUSR1
 	 * _before_ the afs child process gets born by init_afs() below.  It's