From 80fcb5736fb9cee19b5e34afc081ea93387c02cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@guh.io>
Date: Thu, 22 Sep 2016 15:37:42 +0200
Subject: [PATCH] add colour to stdout fix cloud url update cloud api

---
 server/cloud/cloudauthenticationhandler.cpp | 11 +++++++----
 server/cloud/cloudinterface.cpp             |  2 +-
 server/main.cpp                             | 22 ++++++++++++---------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/server/cloud/cloudauthenticationhandler.cpp b/server/cloud/cloudauthenticationhandler.cpp
index fc99d6f9..a5fcf69d 100644
--- a/server/cloud/cloudauthenticationhandler.cpp
+++ b/server/cloud/cloudauthenticationhandler.cpp
@@ -41,13 +41,16 @@ QString CloudAuthenticationHandler::nameSpace() const
 void CloudAuthenticationHandler::processAuthenticate(const QVariantMap &params)
 {
     if (params.contains("authenticationError")) {
-        if (params.value("authenticationError").toString() == "AuthenticationErrorSuccess") {
-            if (params.contains("connectionId"))
+        if (params.value("authenticationError").toString() == "AuthenticationErrorNoError") {
+            if (params.contains("connectionId")) {
                 GuhCore::instance()->cloudManager()->onConnectionAuthentificationFinished(true, params.value("connectionId").toUuid());
-        } else {
-            GuhCore::instance()->cloudManager()->onConnectionAuthentificationFinished(false, QUuid());
+                return;
+            }
         }
+        qCWarning(dcCloud()) << "Authentication error:" << params.value("authenticationError").toString();
     }
+
+    GuhCore::instance()->cloudManager()->onConnectionAuthentificationFinished(false, QUuid());
 }
 
 }
diff --git a/server/cloud/cloudinterface.cpp b/server/cloud/cloudinterface.cpp
index 4e0b5879..ac07b0d8 100644
--- a/server/cloud/cloudinterface.cpp
+++ b/server/cloud/cloudinterface.cpp
@@ -95,7 +95,7 @@ void CloudInterface::dataReceived(const QVariantMap &data)
 
     // check if this is a reply to a request
     if (!reply.isNull() && !data.contains("notification")) {
-        qCDebug(dcCloud()) << "JsonRpc: got response for" << QString("%1.%2").arg(reply->nameSpace(), reply->method());
+        //qCDebug(dcCloud()) << "JsonRpc: got response for" << QString("%1.%2").arg(reply->nameSpace(), reply->method());
         CloudJsonHandler *handler = m_handlers.value(reply->nameSpace());
 
         if (!QMetaObject::invokeMethod(handler, QString("process" + reply->method()).toLatin1().data(), Q_ARG(QVariantMap, params)))
diff --git a/server/main.cpp b/server/main.cpp
index 61e947a9..5cb5ccb0 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -43,6 +43,10 @@
 
 static QHash<QString, bool> s_loggingFilters;
 
+static const char *const normal = "\033[0m";
+static const char *const warning = "\e[33m";
+static const char *const error = "\e[31m";
+
 using namespace guhserver;
 
 static void loggingCategoryFilter(QLoggingCategory *category)
@@ -74,15 +78,15 @@ static void consoleLogHandler(QtMsgType type, const QMessageLogContext& context,
         break;
     case QtWarningMsg:
         messageString = QString(" W %1 | %2: %3").arg(timeString).arg(context.category).arg(message);
-        fprintf(stdout, " W | %s: %s\n", context.category, message.toUtf8().data());
+        fprintf(stdout, "%s W | %s: %s%s\n", warning, context.category, message.toUtf8().data(), normal);
         break;
     case QtCriticalMsg:
         messageString = QString(" C %1 | %2: %3").arg(timeString).arg(context.category).arg(message);
-        fprintf(stdout, " C | %s: %s\n", context.category, message.toUtf8().data());
+        fprintf(stdout, "%s C | %s: %s%s\n", error, context.category, message.toUtf8().data(), normal);
         break;
     case QtFatalMsg:
         messageString = QString(" F %1 | %2: %3").arg(timeString).arg(context.category).arg(message);
-        fprintf(stdout, " F | %s: %s\n", context.category, message.toUtf8().data());
+        fprintf(stdout, "%s F | %s: %s%s\n", error, context.category, message.toUtf8().data(), normal);
         break;
     }
     fflush(stdout);
@@ -92,6 +96,7 @@ static void consoleLogHandler(QtMsgType type, const QMessageLogContext& context,
         fprintf(stdout, " W | Application: Could not open logfile.\n");
         return;
     }
+
     QTextStream textStream(&logFile);
     textStream << messageString << endl;
     logFile.close();
@@ -164,17 +169,17 @@ int main(int argc, char *argv[])
     // create sorted loggingFiler list
     QStringList sortedFilterList = QStringList(s_loggingFilters.keys());
     sortedFilterList.sort();
-    foreach (const QString &filterName, sortedFilterList) {
+    foreach (const QString &filterName, sortedFilterList)
         debugDescription += "\n- " + filterName + " (" + (s_loggingFilters.value(filterName) ? "yes" : "no") + ")";
-    }
+
 
     // create sorted plugin loggingFiler list
     QStringList sortedPluginList = QStringList(loggingFiltersPlugins.keys());
     sortedPluginList.sort();
     debugDescription += "\n\nPlugin categories:\n";
-    foreach (const QString &filterName, sortedPluginList) {
+    foreach (const QString &filterName, sortedPluginList)
         debugDescription += "\n- " + filterName + " (" + (s_loggingFilters.value(filterName) ? "yes" : "no") + ")";
-    }
+
 
     QCommandLineOption allOption(QStringList() << "p" << "print-all", QCoreApplication::translate("main", "Enables all debug categories. This parameter overrides all debug category parameters."));
     parser.addOption(allOption);
@@ -184,9 +189,8 @@ int main(int argc, char *argv[])
     parser.process(application);
 
     // add plugin metadata to the static hash
-    foreach (const QString &category, loggingFiltersPlugins.keys()) {
+    foreach (const QString &category, loggingFiltersPlugins.keys())
         s_loggingFilters.insert(category, false);
-    }
 
     // check debug area
     if (!parser.isSet(allOption)) {