From 3a431543fab567d42f5981d82687c1c9a9244f68 Mon Sep 17 00:00:00 2001
From: Jacob Brydolf <jacob@brydolf.net>
Date: Mon, 7 Nov 2016 13:10:10 +0100
Subject: [PATCH] DaemonManager: added console updated signals

---
 src/daemon/DaemonManager.cpp | 17 +++++++++++++----
 src/daemon/DaemonManager.h   |  2 ++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp
index 80d7c8a4..1fdfcd52 100644
--- a/src/daemon/DaemonManager.cpp
+++ b/src/daemon/DaemonManager.cpp
@@ -41,6 +41,7 @@ bool DaemonManager::start()
     QStringList arguments;
 
     m_daemon = new QProcess();
+    initialized = true;
 
     // Connect output slots
     connect (m_daemon, SIGNAL(readyReadStandardOutput()), this, SLOT(printOutput()));
@@ -61,7 +62,7 @@ bool DaemonManager::start()
 
 bool DaemonManager::stop()
 {
-    if(m_daemon){
+    if(initialized){
         qDebug() << "stopping daemon";
         m_daemon->terminate();
         // Wait until stopped. Max 10 seconds
@@ -80,7 +81,8 @@ void DaemonManager::printOutput()
 
     foreach (QString line, strLines){
        // dConsole.append(line+"\n");
-        qDebug() << "Daemon: " + line;
+        emit daemonConsoleUpdated(line);
+       // qDebug() << "Daemon: " + line;
     }
 }
 
@@ -91,13 +93,20 @@ void DaemonManager::printError()
 
     foreach (QString line, strLines){
        // dConsole.append(line+"\n");
-        qDebug() << "Daemon ERROR: " + line;
+        emit daemonConsoleUpdated(line);
+       // qDebug() << "Daemon ERROR: " + line;
     }
 }
 
 bool DaemonManager::running() const
 {
-    return m_daemon && m_daemon->state() > QProcess::NotRunning;
+    if(initialized){
+        qDebug() << m_daemon->state();
+        qDebug() << QProcess::NotRunning;
+
+        return m_daemon->state() > QProcess::NotRunning;
+    }
+    return false;
 }
 
 QString DaemonManager::console() const
diff --git a/src/daemon/DaemonManager.h b/src/daemon/DaemonManager.h
index b4170047..4dfc77a1 100644
--- a/src/daemon/DaemonManager.h
+++ b/src/daemon/DaemonManager.h
@@ -23,6 +23,7 @@ public:
 signals:
     void daemonStarted();
     void daemonStopped();
+    void daemonConsoleUpdated(QString message);
 
 public slots:
     void printOutput();
@@ -34,6 +35,7 @@ private:
     static DaemonManager * m_instance;
     QProcess *m_daemon;
     QString dConsole;
+    bool initialized = false;
 
 };