From 98c120a2037391ad1d475b7e3566505ede36cb77 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 28 Jul 2004 22:05:47 +0000 Subject: Revert ill-conceived patch that made elog(FATAL) the same as elog(ERROR) followed by seeing EOF from client. If we want a safe session-kill capability we will need to write one, not break our error handling mechanism. --- src/backend/tcop/postgres.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/backend/tcop/postgres.c') diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index a353122fc26..a8a7e0197ae 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.425 2004/07/27 05:11:03 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.426 2004/07/28 22:05:46 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -2932,10 +2932,7 @@ PostgresMain(int argc, char *argv[], const char *username) /* * (3) read a command (loop blocks here) */ - if (!in_fatal_exit) - firstchar = ReadCommand(&input_message); - else - firstchar = EOF; + firstchar = ReadCommand(&input_message); /* * (4) disable async signal conditions again. @@ -3164,8 +3161,7 @@ PostgresMain(int argc, char *argv[], const char *username) * Otherwise it will fail to be called during other * backend-shutdown scenarios. */ - proc_exit(!in_fatal_exit ? 0 : proc_exit_inprogress || - !IsUnderPostmaster); + proc_exit(0); case 'd': /* copy data */ case 'c': /* copy done */ -- cgit v1.2.3