From 77639532bd5de75c44609b8286f64d98ce9f57eb Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Fri, 27 Oct 2017 15:02:52 +0200
Subject: [PATCH] fix(MainDb): log unfetched events

---
 src/db/main-db.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp
index 38c935bd8..28194aa8f 100644
--- a/src/db/main-db.cpp
+++ b/src/db/main-db.cpp
@@ -1003,15 +1003,19 @@ MainDb::MainDb (Core *core) : AbstractDb(*new MainDbPrivate) {
 
 		soci::rowset<soci::row> rows = (session->prepare << query, soci::use(peerAddress));
 		for (const auto &row : rows) {
-			shared_ptr<EventLog> log = d->selectGenericConferenceEvent(
-				// See: http://soci.sourceforge.net/doc/master/backends/
-				// `row id` is not supported by soci on Sqlite3. It's necessary to cast id to int...
-				getBackend() == Sqlite3 ? static_cast<long long>(row.get<int>(0)) : row.get<long long>(0),
+			// See: http://soci.sourceforge.net/doc/master/backends/
+			// `row id` is not supported by soci on Sqlite3. It's necessary to cast id to int...
+			long long eventId = getBackend() == Sqlite3 ? static_cast<long long>(row.get<int>(0)) : row.get<long long>(0);
+			shared_ptr<EventLog> event = d->selectGenericConferenceEvent(
+				eventId,
 				static_cast<EventLog::Type>(row.get<int>(1)),
 				Utils::getTmAsTimeT(row.get<tm>(2)),
 				peerAddress
 			);
-			if (log) events.push_back(log);
+			if (event)
+				events.push_back(event);
+			else
+				lWarning() << "Unable to fetch event: " << eventId;
 		}
 
 		L_END_LOG_EXCEPTION