Restore app logging

Author: uglide

src/app/events.cpp

@@ -1 +1,13 @@
 #include "events.h"
+
+void Events::registerLoggerForConnection(RedisClient::Connection& c) {
+  QObject::connect(&c, &RedisClient::Connection::log,
+                   [this](const QString& info) {
+                     emit log(QString("Connection: %1").arg(info));
+                   });
+
+  QObject::connect(&c, &RedisClient::Connection::error,
+                   [this](const QString& error) {
+                     emit log(QString("Connection: %1").arg(error));
+                   });
+}

src/app/events.h

@@ -14,6 +14,9 @@ class KeyItem;
 class Events : public QObject {
   Q_OBJECT
 
+ public:
+  void registerLoggerForConnection(RedisClient::Connection& c);
+
  signals:
 
   // Tabs

src/app/models/connectionsmanager.cpp

@@ -40,7 +40,7 @@ void ConnectionsManager::addNewConnection(const ServerConfig& config,
 
   // add connection to connection tree
   auto treeModel = QSharedPointer<TreeOperations>(
-      new TreeOperations(cloneConnection(connection), m_events));
+      new TreeOperations(connection->clone(), m_events));
   createServerItemForConnection(connection, treeModel);
 
   if (saveToConfig) saveConfig();
@@ -63,7 +63,7 @@ void ConnectionsManager::updateConnection(const ServerConfig& config) {
 
   if (!operations) return;
 
-  operations->setConnection(cloneConnection(connection));
+  operations->setConnection(connection->clone());
 
   emit dataChanged(index(serverItem->row(), 0, QModelIndex()),
                    index(serverItem->row(), 0, QModelIndex()));
@@ -128,7 +128,7 @@ bool ConnectionsManager::saveConnectionsConfigToFile(
 
 bool ConnectionsManager::testConnectionSettings(const ServerConfig& config) {
   RedisClient::Connection testConnection(config);
-  registerLoggerForConnection(testConnection);
+  m_events->registerLoggerForConnection(testConnection);
 
   try {
     return testConnection.connect();
@@ -192,23 +192,3 @@ void ConnectionsManager::createServerItemForConnection(
   m_connectionMapping.insert(connection, serverItem);
   addRootItem(serverItem);
 }
-
-QSharedPointer<RedisClient::Connection> ConnectionsManager::cloneConnection(
-    QSharedPointer<RedisClient::Connection> c) {
-  auto copy = c->clone();
-  registerLoggerForConnection(*copy.data());
-  return copy;
-}
-
-void ConnectionsManager::registerLoggerForConnection(
-    RedisClient::Connection& c) {
-  QObject::connect(&c, &RedisClient::Connection::log,
-                   [this](const QString& info) {
-                     emit m_events->log(QString("Connection: %1").arg(info));
-                   });
-
-  QObject::connect(&c, &RedisClient::Connection::error,
-                   [this](const QString& error) {
-                     emit m_events->log(QString("Connection: %1").arg(error));
-                   });
-}

src/app/models/connectionsmanager.h

@@ -60,11 +60,6 @@ class ConnectionsManager : public ConnectionsTree::Model,
       QSharedPointer<RedisClient::Connection> connection,
       QSharedPointer<TreeOperations> treeModel);
 
-  QSharedPointer<RedisClient::Connection> cloneConnection(
-      QSharedPointer<RedisClient::Connection> c);
-
-  void registerLoggerForConnection(RedisClient::Connection& c);
-
  private:
   QString m_configPath;
   QList<QSharedPointer<RedisClient::Connection>> m_connections;

src/app/models/treeoperations.cpp

@@ -16,11 +16,14 @@
 TreeOperations::TreeOperations(
     QSharedPointer<RedisClient::Connection> connection,
     QSharedPointer<Events> events)
-    : m_connection(connection), m_events(events), m_dbCount(0) {}
+    : m_connection(connection), m_events(events), m_dbCount(0) {
+  m_events->registerLoggerForConnection(*connection);
+}
 
 bool TreeOperations::loadDatabases(
     std::function<void(RedisClient::DatabaseList)> callback) {
   auto connection = m_connection->clone();
+  m_events->registerLoggerForConnection(*connection);
 
   bool connected = false;
 
@@ -90,15 +93,15 @@ QFuture<bool> TreeOperations::getDatabases(
   QFuture<bool> result =
       QtConcurrent::run(this, &TreeOperations::loadDatabases, callback);
 
-  AsyncFuture::observe(result).subscribe([]() {},
-                                         [this]() {
-                                           QtConcurrent::run([this]() {
-                                             auto oldConnection = m_connection;
-                                             m_connection =
-                                                 oldConnection->clone();
-                                             oldConnection->disconnect();
-                                           });
-                                         });
+  AsyncFuture::observe(result).subscribe(
+      []() {},
+      [this]() {
+        QtConcurrent::run([this]() {
+          auto oldConnection = m_connection;
+          setConnection(oldConnection->clone());
+          oldConnection->disconnect();
+        });
+      });
 
   return result;
 }
@@ -263,4 +266,5 @@ bool TreeOperations::isConnected() const { return m_connection->isConnected(); }
 
 void TreeOperations::setConnection(QSharedPointer<RedisClient::Connection> c) {
   m_connection = c;
+  m_events->registerLoggerForConnection(*c);
 }