Re-format code to avoid overly long lines and declarations

This commit is contained in:
Nils O. Selåsdal
2015-04-04 23:29:27 +02:00
parent a55139aba6
commit c6318c079d
17 changed files with 94 additions and 46 deletions
+10 -5
View File
@@ -66,18 +66,22 @@ again:
}
if (WIFSIGNALED(status)) {
syslog(LOG_ERR, "supervised process(pid %ld) exited cause of signal %d, status = 0x%X", (long)pid, WTERMSIG(status), status);
syslog(LOG_ERR, "supervised process(pid %ld) exited cause of signal %d, status = 0x%X",
(long)pid, WTERMSIG(status), status);
return RESTART;
} else if (WIFEXITED(status)) {
syslog(LOG_ERR, "supervised process(pid %ld) exited with code %d, status = 0x%X", (long)pid, WTERMSIG(status), status);
syslog(LOG_ERR, "supervised process(pid %ld) exited with code %d, status = 0x%X",
(long)pid, WTERMSIG(status), status);
return RESTART;
}
/* Ok, can we ever get here ? */
syslog(LOG_ERR, "waitpid of supervised process(pid %ld) status = 0x%X", (long)pid, status);
syslog(LOG_ERR, "waitpid of supervised process(pid %ld) status = 0x%X",
(long)pid, status);
if (kill(pid, 0) == 0) {
syslog(LOG_ERR, "supervised process(pid %ld) seems to still be alive, not restarting", (long)pid);
syslog(LOG_ERR, "supervised process(pid %ld) seems to still be alive, not restarting",
(long)pid);
goto again;
}
@@ -134,7 +138,8 @@ int uc_supervise(void)
switch (cmd) {
case CLEAN_EXIT:
syslog(LOG_INFO, "Terminating supervised pid %lu", (unsigned long)pid);
syslog(LOG_INFO, "Terminating supervised pid %lu",
(unsigned long)pid);
kill_supervised_process(pid);
wait(NULL);
syslog(LOG_INFO, "Exiting");