On Wed, Sep 28, 2016 at 09:14:41AM -0400, Tom Lane wrote: > Robert Haas <robertmh...@gmail.com> writes: > > psql tends to do things like this: > > rhaas=# select * from pg_stat_activity; > > FATAL: terminating connection due to administrator command > > server closed the connection unexpectedly > > This probably means the server terminated abnormally > > before or while processing the request. > > > Basically everything psql has to say about this is a lie: > > I cannot get terribly excited about this. What you seem to be proposing > is that psql try to intuit the reason for connection closure from the > last error message it got, but that seems likely to lead to worse lies > than printing a boilerplate message. > > I could go along with just dropping the last sentence ("This probably...") > if the last error we got was FATAL level. I don't find "unexpectedly" > to be problematic here: from the point of view of psql, and probably > of its user, the shutdown *was* unexpected.
I looked at this thread from 2016 and I think the problem is the "abnormally" word, since if the server was shutdown by the administrator (most likely), it isn't abnormal. Here is a patch to remove "abnormally". -- Bruce Momjian <br...@momjian.us> https://momjian.us EDB https://enterprisedb.com Only you can decide what is important to you.
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 660cdec93c..634708d716 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -749,7 +749,7 @@ retry4: */ definitelyEOF: libpq_append_conn_error(conn, "server closed the connection unexpectedly\n" - "\tThis probably means the server terminated abnormally\n" + "\tThis probably means the server terminated\n" "\tbefore or while processing the request."); /* Come here if lower-level code already set a suitable errorMessage */ diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index f1192d28f2..115776ce6c 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -206,7 +206,7 @@ rloop: if (result_errno == EPIPE || result_errno == ECONNRESET) libpq_append_conn_error(conn, "server closed the connection unexpectedly\n" - "\tThis probably means the server terminated abnormally\n" + "\tThis probably means the server terminated\n" "\tbefore or while processing the request."); else libpq_append_conn_error(conn, "SSL SYSCALL error: %s", @@ -306,7 +306,7 @@ pgtls_write(PGconn *conn, const void *ptr, size_t len) result_errno = SOCK_ERRNO; if (result_errno == EPIPE || result_errno == ECONNRESET) libpq_append_conn_error(conn, "server closed the connection unexpectedly\n" - "\tThis probably means the server terminated abnormally\n" + "\tThis probably means the server terminated\n" "\tbefore or while processing the request."); else libpq_append_conn_error(conn, "SSL SYSCALL error: %s", diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c index bd72a87bbb..b972bd3ced 100644 --- a/src/interfaces/libpq/fe-secure.c +++ b/src/interfaces/libpq/fe-secure.c @@ -233,7 +233,7 @@ pqsecure_raw_read(PGconn *conn, void *ptr, size_t len) case EPIPE: case ECONNRESET: libpq_append_conn_error(conn, "server closed the connection unexpectedly\n" - "\tThis probably means the server terminated abnormally\n" + "\tThis probably means the server terminated\n" "\tbefore or while processing the request."); break; @@ -395,7 +395,7 @@ retry_masked: /* (strdup failure is OK, we'll cope later) */ snprintf(msgbuf, sizeof(msgbuf), libpq_gettext("server closed the connection unexpectedly\n" - "\tThis probably means the server terminated abnormally\n" + "\tThis probably means the server terminated\n" "\tbefore or while processing the request.")); /* keep newline out of translated string */ strlcat(msgbuf, "\n", sizeof(msgbuf));