attempt a restart on a connection error (bug #3628)

git-svn-id: http://svn.digium.com/svn/asterisk/branches/v1-0@5090 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 16 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 3f30d298f..695fcd387 100755
--- a/CHANGES
+++ b/CHANGES
@@ -43,6 +43,8 @@ Asterisk 1.0.6
     -- If the server you were using was going down, it had the potential to bring your asterisk
        server down with it. Extra stuff has been added so as to bring in more error/connection
        checking.
+ -- cdr_pgsql:
+    -- This will now attempt to reconnect after a connection problem.
  -- internals
     -- Behavior was changed for 'show codec <number>' to make it more intuitive. (kshumard)
     -- DNS failures and asterisk do not get along too well, this is not totally the case anymore.
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index f6af7ff58..90d386fdc 100755
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -127,6 +127,19 @@ static int pgsql_log(struct ast_cdr *cdr)
                         pgerror = PQresultErrorMessage(result);
 			ast_log(LOG_ERROR,"cdr_pgsql: Failed to insert call detail record into database!\n");
                         ast_log(LOG_ERROR,"cdr_pgsql: Reason: %s\n", pgerror);
+			ast_log(LOG_ERROR,"cdr_pgsql: Connection may have been lost... attempting to reconnect.\n");
+			PQreset(conn);
+			if (PQstatus(conn) == CONNECTION_OK) {
+				ast_log(LOG_ERROR, "cdr_pgsql: Connection reestablished.\n");
+				connected = 1;
+				result = PQexec(conn, sqlcmd);
+				if ( PQresultStatus(result) != PGRES_COMMAND_OK)
+				{
+					pgerror = PQresultErrorMessage(result);
+					ast_log(LOG_ERROR,"cdr_pgsql: HARD ERROR!  Attempted reconnection failed.  DROPPING CALL RECORD!\n");
+					ast_log(LOG_ERROR,"cdr_pgsql: Reason: %s\n", pgerror);
+				}
+			}
 			ast_mutex_unlock(&pgsql_lock);
 			return -1;
 		}
@@ -287,7 +300,7 @@ static int process_my_load_module(struct ast_config *cfg)
 		connected = 1;
 	} else {
                 pgerror = PQerrorMessage(conn);
-		ast_log(LOG_ERROR, "cdr_pgsql: Unable to connect to database server %s.  Calls will not be logged!\n", pghostname);
+		ast_log(LOG_ERROR, "cdr_pgsql: Unable to connect to database server %s.  CALLS WILL NOT BE LOGGED!!\n", pghostname);
                 ast_log(LOG_ERROR, "cdr_pgsql: Reason: %s\n", pgerror);
 		connected = 0;
 	}