From 46d1498801f84ed20636d285141ddd84d6ac1ac0 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Wed, 22 Mar 2017 11:28:50 -0400
Subject: [PATCH] TT#13277 logging improvements

Change-Id: I279f751795b5d913b44f00ba30146654691d4d22
---
 recording-daemon/db.c   | 16 ++++++++++++----
 recording-daemon/main.c |  7 ++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/recording-daemon/db.c b/recording-daemon/db.c
index 7f525bf61..9b5f809e4 100644
--- a/recording-daemon/db.c
+++ b/recording-daemon/db.c
@@ -93,7 +93,7 @@ static int check_conn() {
 				"(?,?,?)"))
 		goto err;
 
-	ilog(LOG_INFO, "Connection to MySQL established");
+	ilog(LOG_DEBUG, "Connection to MySQL established");
 
 	return 0;
 
@@ -150,7 +150,8 @@ INLINE void my_d(MYSQL_BIND *b, const double *d) {
 
 
 static void execute_wrap(MYSQL_STMT **stmt, MYSQL_BIND *binds, unsigned long long *auto_id) {
-	for (int retr = 0; retr < 5; retr++) {
+	int retr = 0;
+	while (1) {
 		if (mysql_stmt_bind_param(*stmt, binds))
 			goto err;
 		if (mysql_stmt_execute(*stmt))
@@ -166,13 +167,20 @@ static void execute_wrap(MYSQL_STMT **stmt, MYSQL_BIND *binds, unsigned long lon
 		return;
 
 err:
-		ilog(LOG_ERR, "Failed to bind or execute prepared statement: %s",
-				mysql_stmt_error(*stmt));
+		if (retr > 5) {
+			// fatal
+			ilog(LOG_ERR, "Failed to bind or execute prepared statement: %s",
+					mysql_stmt_error(*stmt));
+			reset_conn();
+			return;
+		}
 		if (retr > 2) {
 			reset_conn();
 			if (check_conn())
 				return;
 		}
+
+		retr++;
 	}
 }
 
diff --git a/recording-daemon/main.c b/recording-daemon/main.c
index 965f8c045..4fe980d1a 100644
--- a/recording-daemon/main.c
+++ b/recording-daemon/main.c
@@ -60,7 +60,12 @@ static void avlog_ilog(void *ptr, int loglevel, const char *fmt, va_list ap) {
 	if (vasprintf(&msg, fmt, ap) <= 0)
 		ilog(LOG_ERR, "av_log message dropped");
 	else {
-		ilog(MAX(LOG_ERR, loglevel), "av_log: %s", msg);
+		// defuse avlog log levels to be either DEBUG or ERR
+		if (loglevel <= LOG_ERR)
+			loglevel = LOG_ERR;
+		else
+			loglevel = LOG_DEBUG;
+		ilog(loglevel, "av_log: %s", msg);
 		free(msg);
 	}
 }