diff options
-rw-r--r-- | ChangeLog.txt | 1 | ||||
-rw-r--r-- | pseudo.c | 9 | ||||
-rw-r--r-- | pseudo_client.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 30e5d02..5e6d670 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -2,6 +2,7 @@ * (seebs) require -S to shutdown server when running a command. * (seebs) improve logic for server shutdowns, increase short timeout * (seebs) rework client server-spawning logic significantly + * (seebs) make abort messages make it out, display message on abort 2016-02-05: * (seebs) don't abort search for server on first try. @@ -422,7 +422,14 @@ main(int argc, char *argv[]) { if (opt_S) { pseudo_client_shutdown(); } - return WEXITSTATUS(rc); + if (WIFEXITED(rc)) { + return WEXITSTATUS(rc); + } else if (WIFSIGNALED(rc)) { + kill(getpid(), WTERMSIG(rc)); + exit(1); + } else { + exit(1); + } } else { rc = execv(fullpath, argv); if (rc == -1) { diff --git a/pseudo_client.c b/pseudo_client.c index 00d18d0..b02657f 100644 --- a/pseudo_client.c +++ b/pseudo_client.c @@ -1270,7 +1270,7 @@ pseudo_client_request(pseudo_msg_t *msg, size_t len, const char *path) { return 0; } } - pseudo_debug(PDBGF_CLIENT, "server connection persistently failed, aborting.\n"); + pseudo_diag("pseudo: server connection persistently failed, aborting.\n"); abort(); return 0; } |