issue error when database has gone away (#879)

TODO: postgresql doesn't automatically reconnect
axelsteiner · Feb 1, 2011 · 901e5ec · 901e5ec
1 parent e61abde
commit 901e5ec
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/lmtp.c b/src/lmtp.c
@@ -67,6 +67,12 @@ void send_greeting(ClientSession_t *session)
 {
 	field_t banner;
 	GETCONFIGVALUE("banner", "LMTP", banner);
+	if (! dm_db_ping()) {
+		ci_write(session->ci, "500 database has gone fishing BYE\r\n");
+		session->state = QUIT;
+		return;
+	}
+
 	if (strlen(banner) > 0)
 		ci_write(session->ci, "220 %s %s\r\n", session->hostname, banner);
 	else

diff --git a/src/pop3.c b/src/pop3.c
@@ -58,6 +58,12 @@ static void send_greeting(ClientSession_t *session)
 {
 	field_t banner;
 	GETCONFIGVALUE("banner", "POP", banner);
+	if (! dm_db_ping()) {
+		ci_write(session->ci, "+ERR database has gone fishing\r\n");
+		session->state = CLIENTSTATE_QUIT;
+		return;
+	}
+
 	if (strlen(banner) > 0) {
 		ci_write(session->ci, "+OK %s %s\r\n", banner, session->apop_stamp);
 	} else {

diff --git a/src/timsieve.c b/src/timsieve.c
@@ -70,6 +70,12 @@ static void send_greeting(ClientSession_t *session)
 {
 	field_t banner;
 	GETCONFIGVALUE("banner", "SIEVE", banner);
+	if (! dm_db_ping()) {
+		ci_write(session->ci, "BYE \"database has gone fishing\"\r\n");
+		session->state = QUIT;
+		return;
+	}
+
 	if (strlen(banner) > 0)
 		ci_write(session->ci, "\"IMPLEMENTATION\" \"%s\"\r\n", banner);
 	else