codeformating, change to log4cxx

1 files changed, 51 insertions, 48 deletions

diff --git a/src/fbgui/fbgui.cpp b/src/fbgui/fbgui.cpp
index 437568e..85a0660 100644
--- a/src/fbgui/fbgui.cpp
+++ b/src/fbgui/fbgui.cpp
@@ -1,9 +1,17 @@
 #include "fbgui.h"
 #include "sysinfo.h"
-#include "loggerengine.h"
 #include "downloadmanager.h"
 #include "javascriptinterface.h"
 
+
+#include <log4cxx/logger.h>
+#include "qlog4cxx.h"
+
+using namespace log4cxx;
+using namespace log4cxx::helpers;
+LoggerPtr coreLogger(Logger::getLogger("fbgui.core"));
+
+
 #include <iostream>
 #include <QThread>
 #include <QtWebKit>
@@ -45,7 +53,7 @@ fbgui::~fbgui() {
  */
 void fbgui::init() {
 	// start fbgui
-	qxtLog->debug() << "Initializing fbgui...";
+	LOG4CXX_DEBUG(coreLogger, "Initializing fbgui...");
 
 	setupLayout();
 	createActions();
@@ -150,23 +158,22 @@ void fbgui::watchForTrigger() {
    // check if fileToTriggerURL already exists
    QFile file(fileToTriggerURL);
    if (file.exists()) {
-      qxtLog->debug() << "[watcher] " << fileToTriggerURL << " found.";
+      LOG4CXX_DEBUG(coreLogger, "[watcher] " << fileToTriggerURL << " found.");
       // try to load URL
       loadURL();
    } else {
       // create it
       if (file.open(QIODevice::WriteOnly)) {
-         qxtLog->debug() << "[gui] Created: " << fileToTriggerURL;
+         LOG4CXX_DEBUG(coreLogger, "[gui] Created: " << fileToTriggerURL);
          file.close();
       } else {
-         qxtLog->debug() << "[gui] Creation of " << fileToTriggerURL
-               << " failed!";
-         qxtLog->debug() << "[gui] Exiting in 5 seconds...";
+         LOG4CXX_DEBUG(coreLogger, "[gui] Creation of " << fileToTriggerURL << " failed!");
+         LOG4CXX_DEBUG(coreLogger, "[gui] Exiting in 5 seconds...");
          QTimer::singleShot(5000, this, SLOT(close()));
       }
    }
    // watch the path to trigger file
-   qxtLog->debug() << "[watcher] Watching " << fileToTriggerURL;
+   LOG4CXX_DEBUG(coreLogger, "[watcher] Watching " << fileToTriggerURL);
    _watcher = new QFileSystemWatcher(QStringList(fileToTriggerURL), this);
 QObject::connect(_watcher, SIGNAL(fileChanged(const QString&)), this, SLOT(prepareURLLoad()));
 
@@ -183,9 +190,9 @@ QObject::connect(_watcher, SIGNAL(fileChanged(const QString&)), this, SLOT(prepa
  * @see fbgui::loadURL()
  */
 void fbgui::prepareURLLoad() {
-   qxtLog->debug() << "[watcher] " << fileToTriggerURL << " changed!";
+   LOG4CXX_DEBUG(coreLogger, "[watcher] " << fileToTriggerURL << " changed!");
    // disconnect _watcher, his job is done
-   qxtLog->debug() << "[watcher] disconnected.";
+   LOG4CXX_DEBUG(coreLogger, "[watcher] disconnected.");
    _watcher->disconnect(this);
    _watcher->deleteLater();
    // try to load URL
@@ -203,11 +210,11 @@ void fbgui::prepareURLLoad() {
 bool fbgui::checkHost() const {
    QHostInfo hostInfo = QHostInfo::fromName(baseURL.host());
    if (hostInfo.error() != QHostInfo::NoError) {
-      qxtLog->debug() << "[gui] Lookup of " << baseURL.host() << "failed.";
-      qxtLog->debug() << "[gui] Host can not be reached.";
+      LOG4CXX_DEBUG(coreLogger, "[gui] Lookup of " << baseURL.host() << "failed.");
+      LOG4CXX_DEBUG(coreLogger, "[gui] Host can not be reached.");
       return false;
    } else {
-      qxtLog->debug() << "[gui] Lookup of " << baseURL.host() << " succeeded.";
+      LOG4CXX_DEBUG(coreLogger, "[gui] Lookup of " << baseURL.host() << " succeeded.");
       return true;
    }
 }
@@ -224,7 +231,7 @@ bool fbgui::checkHost() const {
  */
 void fbgui::loadURL() {
    if (checkHost()) {
-      qxtLog->debug() << "[gui] Loading URL: " << baseURL.toString() << " ...";
+      LOG4CXX_DEBUG(coreLogger, "[gui] Loading URL: " << baseURL.toString() << " ...");
 
       // Generate POST identification data needed by PBS.
       QByteArray postData = generatePOSTData();
@@ -240,12 +247,11 @@ void fbgui::loadURL() {
 void fbgui::loadURLDone(bool success) {
    // done contains the success of the loading: false / true
    if (!success) {
-      qxtLog->debug() << "[gui] Loading failed. URL: "
-            << _webView->url().toString();
-      qxtLog->debug() << "[gui] You can quit with CTRL + X ...";
+      LOG4CXX_DEBUG(coreLogger, "[gui] Loading failed. URL: "  << _webView->url().toString());
+      LOG4CXX_DEBUG(coreLogger, "[gui] You can quit with CTRL + X ...");
       // TODO handle failure properly...
    } else {
-      qxtLog->debug() << "[gui] Loaded URL: " << _webView->url().toString();
+      LOG4CXX_DEBUG(coreLogger, "[gui] Loaded URL: " << _webView->url().toString());
    }
 }
 //-------------------------------------------------------------------------------------------
@@ -264,7 +270,7 @@ void fbgui::loadURLDone(bool success) {
  * @see SysInfo::getMainboardSerial()
  */
 QByteArray fbgui::generatePOSTData() {
-   qxtLog->debug() << "[gui] Generating POST data...";
+   LOG4CXX_DEBUG(coreLogger, "[gui] Generating POST data...");
    // use MAC address as base data
    SysInfo si;
    QByteArray data(si.getInfo("mac").toUtf8());
@@ -273,32 +279,31 @@ QByteArray fbgui::generatePOSTData() {
    if (!mbserial.isEmpty())
       data.append(mbserial);
    else {
-      qxtLog->debug()
-            << "[gui] Mainboard serial was empty. Not appending to base hash data.";
+      LOG4CXX_DEBUG(coreLogger, "[gui] Mainboard serial was empty. Not appending to base hash data.");
    }
-   qxtLog->debug() << "[post] Hashing: " << data;
+   LOG4CXX_DEBUG(coreLogger, "[post] Hashing: " << data);
    // generate MD5 hash of data
    QByteArray hash = QCryptographicHash::hash(data, QCryptographicHash::Md5);
-   qxtLog->debug() << "[post] MD5 Hash: " << hash.toHex();
+   LOG4CXX_DEBUG(coreLogger, "[post] MD5 Hash: " << hash.toHex());
 
    // fetch serial number from usb
    QByteArray serial;
    QFile file(serialLocation);
    if (!file.open(QIODevice::ReadOnly)) {
-      qxtLog->debug() << "[post] No such file: " << file.fileName();
+      LOG4CXX_DEBUG(coreLogger, "[post] No such file: " << file.fileName());
    }
    // everything ok, read data
    serial = file.readAll();
    file.close();
    serial.chop(1); // chop EOF
-   qxtLog->debug() << "[post] Serial number is: " << serial;
+   LOG4CXX_DEBUG(coreLogger, "[post] Serial number is: " << serial);
 
    // construct final byte array
    QByteArray postData("mac=");
    postData.append(si.getInfo("mac"));
    postData.append("&hardwarehash=" + hash.toHex());
    postData.append("&serialnumber=" + serial);
-   qxtLog->debug() << "[post] POST data: " << postData;
+   LOG4CXX_DEBUG(coreLogger, "[post] POST data: " << postData);
    return postData;
 }
 
@@ -326,7 +331,7 @@ void fbgui::performShutDown() {
       file.write("o");
       file.close();
    } else {
-      qxtLog->debug() << "[gui] Could not open /proc/sysrq-trigger";
+      LOG4CXX_DEBUG(coreLogger, "[gui] Could not open /proc/sysrq-trigger");
    }
 }
 //-------------------------------------------------------------------------------------------
@@ -349,7 +354,7 @@ void fbgui::performReboot() {
       file.write("b");
       file.close();
    } else {
-      qxtLog->debug() << "[gui] Could not open /proc/sysrq-trigger";
+      LOG4CXX_DEBUG(coreLogger, "[gui] Could not open /proc/sysrq-trigger");
    }
 }
 //-------------------------------------------------------------------------------------------
@@ -379,54 +384,52 @@ void fbgui::loadSystem() {
  */
 void fbgui::prepareKexec() {
 
-   qxtLog->debug() << "[gui] Preparing kexec ...";
+   LOG4CXX_DEBUG(coreLogger, "[gui] Preparing kexec ...");
    // try to read KCL file that was downloaded.
    QFile file(downloadPath + "/kcl");
    if (!file.open(QIODevice::ReadOnly)) {
-      qxtLog->debug() << "[gui] No such file: " << file.fileName();
+      LOG4CXX_DEBUG(coreLogger, "[gui] No such file: " << file.fileName());
    }
    // everything ok, read data.
    QString kcl = file.readAll();
    file.close();
-   qxtLog->debug() << "[gui] KCL from PBS: " << kcl;
+   LOG4CXX_DEBUG(coreLogger, "[gui] KCL from PBS: " << kcl);
 
    // try to read ipconfig file generated by udhcpc.
    file.setFileName("/tmp/ip_config_fbgui");
    if (!file.open(QIODevice::ReadOnly)) {
-      qxtLog->debug() << "[gui] No such file: " << file.fileName();
+      LOG4CXX_DEBUG(coreLogger, "[gui] No such file: " << file.fileName());
    }
    // everything ok, read data.
    QString ipConfig = file.readAll();
    file.close();
-   qxtLog->debug() << "[gui] IP config: " << ipConfig;
+   LOG4CXX_DEBUG(coreLogger, "[gui] IP config: " << ipConfig);
 
    // append ipConfig
    kcl.append(" ip=");
    kcl.append(ipConfig);
-   qxtLog->debug() << "[gui] Complete KCL: " << kcl;
+   LOG4CXX_DEBUG(coreLogger, "[gui] Complete KCL: " << kcl);
 
    // load the kernel + initramfs + append of kcl into kexec.
    QProcess *process = new QProcess(this);
    QString cmdline = "kexec -l " + downloadPath.toUtf8() + "/kernel --initrd="
          + downloadPath.toUtf8() + "/initramfs --append=\"" + kcl.toUtf8()
          + "\"";
-   qxtLog->debug() << "[gui] kexec cmdline: " << cmdline;
+   LOG4CXX_DEBUG(coreLogger, "[gui] kexec cmdline: " << cmdline);
    process->start(cmdline);
    bool ret = process->waitForFinished();
    if (!ret) {
-      qxtLog->debug() << "[gui] Failed to execute: " << cmdline;
-      qxtLog->debug() << "[gui] Exiting in 5 seconds...";
+      LOG4CXX_DEBUG(coreLogger, "[gui] Failed to execute: " << cmdline);
+      LOG4CXX_DEBUG(coreLogger, "[gui] Exiting in 5 seconds...");
       QTimer::singleShot(5000, this, SLOT(close()));
    } else {
-      qxtLog->debug() << "[gui] Kexec load was successfull.";
+      LOG4CXX_DEBUG(coreLogger, "[gui] Kexec load was successfull.");
       if (debugMode < 0) {
          // if process successfully finished, try to run kexec -e
          runKexec();
       } else {
-         qxtLog->debug()
-               << "[gui] Skipping execution of kexec - open debug shell.";
-         qxtLog->debug()
-               << "[gui] To start the system execute \"kexec -e\" in your shell.";
+         LOG4CXX_DEBUG(coreLogger, "[gui] Skipping execution of kexec - open debug shell.");
+         LOG4CXX_DEBUG(coreLogger, "[gui] To start the system execute \"kexec -e\" in your shell.");
          close();
       }
    }
@@ -442,8 +445,8 @@ void fbgui::runKexec() {
    QProcess *process = new QProcess(this);
    process->start("kexec -e");
    if (!process->waitForStarted()) {
-      qxtLog->debug() << "[gui] Failed to execute: kexec -e";
-      qxtLog->debug() << "[gui] Exiting in 5 seconds...";
+      LOG4CXX_DEBUG(coreLogger, "[gui] Failed to execute: kexec -e");
+      LOG4CXX_DEBUG(coreLogger, "[gui] Exiting in 5 seconds...");
       QTimer::singleShot(5000, this, SLOT(close()));
       //TODO: Handle failure properly...
    }
@@ -468,10 +471,10 @@ void fbgui::createDebugConsole() {
    pal.setColor(QPalette::Base, Qt::black);
    _debugConsole->setPalette(pal);
    _debugConsole->setTextColor(Qt::white);
-   // enable custom logger engine
-   qxtLog->addLoggerEngine("fb_logger", new LoggerEngine_fb(_debugConsole));
-   //qxtLog->initLoggerEngine("fb_logger");
-   qxtLog->setMinimumLevel("fb_logger", QxtLogger::DebugLevel);
+   // enable custom coreLogger engine
+//   qxtLog->addLoggerEngine("fb_coreLogger", new LoggerEngine_fb(_debugConsole));
+   //qxtLog->initLoggerEngine("fb_coreLogger");
+//   qxtLog->setMinimumLevel("fb_coreLogger", QxtLogger::DebugLevel);
    // CTRL + D  toggles debug window
    _toggleDebugConsole = new QAction(tr("&toggleDebug"), this);
    _toggleDebugConsole->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D));