X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=94e9ed1cbfba5e24f8f46a6b2a8ee3ad8b3a2c54;hb=b85e61d07fc2fa9e56147af29609a84721947a6f;hp=0c257b358cd49db73fc56d590c4c04cf42c53096;hpb=75654b1a42daafbf74b46bc49ffdb141c77a4d77;p=paraslash.git

diff --git a/command.c b/command.c
index 0c257b35..94e9ed1c 100644
--- a/command.c
+++ b/command.c
@@ -47,12 +47,14 @@ extern struct misc_meta_data *mmd;
 int send_afs_status(struct command_context *cc, int parser_friendly);
 static bool subcmd_should_die;
 
+/*
+ * Don't call PARA_XXX_LOG() here as we might already hold the log mutex. See
+ * generic_signal_handler() for details.
+ */
 static void command_handler_sighandler(int s)
 {
-	if (s != SIGTERM)
-		return;
-	PARA_EMERG_LOG("terminating on signal %d\n", SIGTERM);
-	subcmd_should_die = true;
+	if (s == SIGTERM)
+		subcmd_should_die = true;
 }
 
 /*
@@ -505,6 +507,7 @@ static int com_stat(struct command_context *cc, struct lls_parse_result *lpr)
 	 * while we sleep.
 	 */
 	para_block_signal(SIGTERM);
+	para_block_signal(SIGUSR1);
 	for (;;) {
 		sigset_t set;
 		/*
@@ -536,8 +539,10 @@ static int com_stat(struct command_context *cc, struct lls_parse_result *lpr)
 		 * open a race window similar to the one described above.
 		 */
 		pselect(1, NULL, NULL, NULL, &ts, &set);
-		if (subcmd_should_die)
+		if (subcmd_should_die) {
+			PARA_EMERG_LOG("terminating on SIGTERM\n");
 			goto out;
+		}
 		ret = -E_SERVER_CRASH;
 		if (getppid() == 1)
 			goto out;