remove obsolete debug msg prefixes

7 files changed, 159 insertions, 162 deletions

diff --git a/src/fbgui/downloadmanager.cpp b/src/fbgui/downloadmanager.cpp
index 79b51fc..a0b9836 100644
--- a/src/fbgui/downloadmanager.cpp
+++ b/src/fbgui/downloadmanager.cpp
@@ -37,30 +37,30 @@ void DownloadManager::checkDownloadDirectory() {
    // check if downloadPath exists, if not create it.
    _downloadDir = QDir(downloadPath);
    if (!_downloadDir.exists()) {
-      LOG4CXX_DEBUG(dmLogger, "[dm] Download directory: " << _downloadDir.path() << " doesn't exist.");
+      LOG4CXX_DEBUG(dmLogger, "Download directory: " << _downloadDir.path() << " doesn't exist.");
       // try to create the directory
       if (QDir::current().mkdir(downloadPath)){
-         LOG4CXX_DEBUG(dmLogger, "[dm] Created download directory: " << _downloadDir.path());
+         LOG4CXX_DEBUG(dmLogger, "Created download directory: " << _downloadDir.path());
       } else {
-         LOG4CXX_DEBUG(dmLogger, "[dm] Failed to create directory: " << _downloadDir.path());
+         LOG4CXX_DEBUG(dmLogger, "Failed to create directory: " << _downloadDir.path());
          // try to save to /tmp/fbgui
          _downloadDir.setPath(QDir::tempPath() + "/fbgui");
          if (!_downloadDir.exists()) {
             if (QDir::current().mkdir(QDir::tempPath() + "/fbgui")) {
-               LOG4CXX_DEBUG(dmLogger, "[dm] Successfully created: " << _downloadDir.absolutePath());
+               LOG4CXX_DEBUG(dmLogger, "Successfully created: " << _downloadDir.absolutePath());
             } else {
                // just in case
-               LOG4CXX_DEBUG(dmLogger, "[dm] Failed to create: " << _downloadDir.absolutePath());
-               LOG4CXX_DEBUG(dmLogger, "[dm] Exiting...");
+               LOG4CXX_DEBUG(dmLogger, "Failed to create: " << _downloadDir.absolutePath());
+               LOG4CXX_DEBUG(dmLogger, "Exiting...");
                exit( EXIT_FAILURE);
             }
          } else
-            LOG4CXX_DEBUG(dmLogger, "[dm] " << _downloadDir.absolutePath() << " already exists.");
+            LOG4CXX_DEBUG(dmLogger, "" << _downloadDir.absolutePath() << " already exists.");
       }
    } else
-      LOG4CXX_DEBUG(dmLogger, "[dm] Download directory: " << _downloadDir.absolutePath() << " already exists.");
+      LOG4CXX_DEBUG(dmLogger, "Download directory: " << _downloadDir.absolutePath() << " already exists.");
 
-   LOG4CXX_DEBUG(dmLogger, "[dm] Saving downloads to: " << _downloadDir.absolutePath());
+   LOG4CXX_DEBUG(dmLogger, "Saving downloads to: " << _downloadDir.absolutePath());
    downloadPath = _downloadDir.absolutePath();
 }
 // -------------------------------------------------------------------------------------------------------
@@ -79,14 +79,14 @@ void DownloadManager::downloadFile(const QUrl& fileUrl) {
 // -------------------------------------------------------------------------------------------------------
 void DownloadManager::processDownloadRequest(const QUrl& url) {
    if (url.isEmpty()) {
-      LOG4CXX_DEBUG(dmLogger, "[dm] No URL specified for download.");
+      LOG4CXX_DEBUG(dmLogger, "No URL specified for download.");
       return;
    }
-   LOG4CXX_DEBUG(dmLogger, "[dm] Enqueueing: " << url.toString());
+   LOG4CXX_DEBUG(dmLogger, "Enqueueing: " << url.toString());
    _downloadQueue.enqueue(url);
    if (_dip) {
       // download in progress, return.
-      LOG4CXX_DEBUG(dmLogger, "[dm] Download in progress! Queued:" << url.toString() << "("  << _downloadQueue.size() << " in queue)");
+      LOG4CXX_DEBUG(dmLogger, "Download in progress! Queued:" << url.toString() << "("  << _downloadQueue.size() << " in queue)");
       return;
    }
    // no running downloads: start next in queue
@@ -97,10 +97,10 @@ void DownloadManager::startNextDownload() {
    //QWSServer::instance()->setCursorVisible(false);
    if (_downloadQueue.isEmpty()) {
       emit downloadQueueEmpty();
-      LOG4CXX_DEBUG(dmLogger, "[dm] Download manager ready. (1)");
+      LOG4CXX_DEBUG(dmLogger, "Download manager ready. (1)");
       return;
    }
-   LOG4CXX_DEBUG(dmLogger, "[dm] Starting next download: " << _downloadQueue.head().toString() << "  ("  << _downloadQueue.size() - 1 << " in queue.)");
+   LOG4CXX_DEBUG(dmLogger, "Starting next download: " << _downloadQueue.head().toString() << "  ("  << _downloadQueue.size() - 1 << " in queue.)");
 
    // dequeue next URL to download.
    QUrl url = _downloadQueue.dequeue();
@@ -111,16 +111,16 @@ void DownloadManager::startNextDownload() {
 
    // check if filename exists on target file system
    if (_downloadDir.exists(tmp)) {
-      LOG4CXX_DEBUG(dmLogger, "[dm] File already exists: " << _downloadDir.absoluteFilePath(tmp));
+      LOG4CXX_DEBUG(dmLogger, "File already exists: " << _downloadDir.absoluteFilePath(tmp));
       _outfile.setFileName(
             QString(_downloadDir.absolutePath() + "/" + tmp + ".\%1").arg(_downloaded));
    } else
       _outfile.setFileName(_downloadDir.absoluteFilePath(tmp));
-   LOG4CXX_DEBUG(dmLogger, "[dm] Saving to: " << _outfile.fileName());
+   LOG4CXX_DEBUG(dmLogger, "Saving to: " << _outfile.fileName());
 
    // try to open for writing
    if (!_outfile.open(QIODevice::WriteOnly)) {
-      LOG4CXX_DEBUG(dmLogger, "[dm] No write access to " << _outfile.fileName()   << " . Skipping download...");
+      LOG4CXX_DEBUG(dmLogger, "No write access to " << _outfile.fileName()   << " . Skipping download...");
       return;
    }
 
@@ -148,7 +148,7 @@ void DownloadManager::processMetaInfo() {
    const QByteArray cltag = "Content-Length";
    QByteArray clinfo = _currentDownload->rawHeader(cltag);
    QFileInfo fi(_outfile);
-   LOG4CXX_DEBUG(dmLogger, "[dm] Download Info: " << fi.fileName() << " (Size: " << clinfo.toDouble()    << ")");
+   LOG4CXX_DEBUG(dmLogger, "Download Info: " << fi.fileName() << " (Size: " << clinfo.toDouble()    << ")");
    emit downloadInfo(fi.fileName(), clinfo.toDouble());
 }
 // -------------------------------------------------------------------------------------------------------
@@ -159,7 +159,7 @@ void DownloadManager::downloadReady() {
 // -------------------------------------------------------------------------------------------------------
 void DownloadManager::downloadProgress(qint64 bytesIn, qint64 bytesTotal) {
    if (bytesIn > bytesTotal || bytesTotal <= 0) {
-      LOG4CXX_DEBUG(dmLogger, "[dm] downloadProgress invalid values:" << "In:" << bytesIn   << " / Total: " << bytesTotal);
+      LOG4CXX_DEBUG(dmLogger, "downloadProgress invalid values:" << "In:" << bytesIn   << " / Total: " << bytesTotal);
       return;
    }
    // calculate current speed
@@ -180,7 +180,7 @@ void DownloadManager::downloadProgress(qint64 bytesIn, qint64 bytesTotal) {
       _lastProgress = _currentProgress;
       emit
       updateProgress(_currentProgress, speed, unit);
-      LOG4CXX_DEBUG(dmLogger, "[dm] Download progress of " << _currentDownload->url().toString() << ": "     << bytesIn << "/" << bytesTotal << "(" << _currentProgress << "\%)");
+      LOG4CXX_DEBUG(dmLogger, "Download progress of " << _currentDownload->url().toString() << ": "     << bytesIn << "/" << bytesTotal << "(" << _currentProgress << "\%)");
    }
 }
 // -------------------------------------------------------------------------------------------------------
@@ -191,7 +191,7 @@ void DownloadManager::downloadFinished() {
       _outfile.remove();
       int statusCode =
             _currentDownload->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-      LOG4CXX_DEBUG(dmLogger, "[dm] Download of " << _currentDownload->url().toString()    << " failed with HTTP error code: " << statusCode);
+      LOG4CXX_DEBUG(dmLogger, "Download of " << _currentDownload->url().toString()    << " failed with HTTP error code: " << statusCode);
       emit
       notify(QString("Download failed! HTTP Status Code: %1").arg(statusCode));
       _currentDownload->deleteLater();
@@ -199,7 +199,7 @@ void DownloadManager::downloadFinished() {
       // end download
       _outfile.close();
       _downloaded++;
-      LOG4CXX_DEBUG(dmLogger, "[dm] Download of " << _currentDownload->url().toString()  << " finished. (downloaded = " << _downloaded << ")");
+      LOG4CXX_DEBUG(dmLogger, "Download of " << _currentDownload->url().toString()  << " finished. (downloaded = " << _downloaded << ")");
       emit
       notify(QString("Successfully downloaded %1").arg(_currentDownload->url().toString()));
       _currentDownload->deleteLater();
@@ -208,7 +208,7 @@ void DownloadManager::downloadFinished() {
    // process next in queue, if any
    if (_downloadQueue.isEmpty()) {
       emit downloadQueueEmpty();
-      LOG4CXX_DEBUG(dmLogger, "[dm] Download manager ready. (2)");
+      LOG4CXX_DEBUG(dmLogger, "Download manager ready. (2)");
       return;
    }
    startNextDownload();
diff --git a/src/fbgui/fbgui.cpp b/src/fbgui/fbgui.cpp
index 9795821..e1676d1 100644
--- a/src/fbgui/fbgui.cpp
+++ b/src/fbgui/fbgui.cpp
@@ -163,11 +163,11 @@ void fbgui::watchForTrigger() {
    } else {
       // create it
       if (file.open(QIODevice::WriteOnly)) {
-         LOG4CXX_DEBUG(coreLogger, "[gui] Created: " << fileToTriggerURL);
+         LOG4CXX_DEBUG(coreLogger, "Created: " << fileToTriggerURL);
          file.close();
       } else {
-         LOG4CXX_DEBUG(coreLogger, "[gui] Creation of " << fileToTriggerURL << " failed!");
-         LOG4CXX_DEBUG(coreLogger, "[gui] Exiting in 5 seconds...");
+         LOG4CXX_DEBUG(coreLogger, "Creation of " << fileToTriggerURL << " failed!");
+         LOG4CXX_DEBUG(coreLogger, "Exiting in 5 seconds...");
          QTimer::singleShot(5000, this, SLOT(close()));
       }
    }
@@ -209,11 +209,11 @@ void fbgui::prepareURLLoad() {
 bool fbgui::checkHost() const {
    QHostInfo hostInfo = QHostInfo::fromName(baseURL.host());
    if (hostInfo.error() != QHostInfo::NoError) {
-      LOG4CXX_DEBUG(coreLogger, "[gui] Lookup of " << baseURL.host() << "failed.");
-      LOG4CXX_DEBUG(coreLogger, "[gui] Host can not be reached.");
+      LOG4CXX_DEBUG(coreLogger, "Lookup of " << baseURL.host() << "failed.");
+      LOG4CXX_DEBUG(coreLogger, "Host can not be reached.");
       return false;
    } else {
-      LOG4CXX_DEBUG(coreLogger, "[gui] Lookup of " << baseURL.host() << " succeeded.");
+      LOG4CXX_DEBUG(coreLogger, "Lookup of " << baseURL.host() << " succeeded.");
       return true;
    }
 }
@@ -230,7 +230,7 @@ bool fbgui::checkHost() const {
  */
 void fbgui::loadURL() {
    if (checkHost()) {
-      LOG4CXX_DEBUG(coreLogger, "[gui] Loading URL: " << baseURL.toString() << " ...");
+      LOG4CXX_DEBUG(coreLogger, "Loading URL: " << baseURL.toString() << " ...");
 
       // Generate POST identification data needed by PBS.
       QByteArray postData = generatePOSTData();
@@ -246,11 +246,11 @@ void fbgui::loadURL() {
 void fbgui::loadURLDone(bool success) {
    // done contains the success of the loading: false / true
    if (!success) {
-      LOG4CXX_DEBUG(coreLogger, "[gui] Loading failed. URL: "  << _webView->url().toString());
-      LOG4CXX_DEBUG(coreLogger, "[gui] You can quit with CTRL + X ...");
+      LOG4CXX_DEBUG(coreLogger, "Loading failed. URL: "  << _webView->url().toString());
+      LOG4CXX_DEBUG(coreLogger, "You can quit with CTRL + X ...");
       // TODO handle failure properly...
    } else {
-      LOG4CXX_DEBUG(coreLogger, "[gui] Loaded URL: " << _webView->url().toString());
+      LOG4CXX_DEBUG(coreLogger, "Loaded URL: " << _webView->url().toString());
    }
 }
 //-------------------------------------------------------------------------------------------
@@ -269,7 +269,7 @@ void fbgui::loadURLDone(bool success) {
  * @see SysInfo::getMainboardSerial()
  */
 QByteArray fbgui::generatePOSTData() {
-   LOG4CXX_DEBUG(coreLogger, "[gui] Generating POST data...");
+   LOG4CXX_DEBUG(coreLogger, "Generating POST data...");
    // use MAC address as base data
    SysInfo si;
    QByteArray data(si.getInfo("mac").toUtf8());
@@ -278,7 +278,7 @@ QByteArray fbgui::generatePOSTData() {
    if (!mbserial.isEmpty())
       data.append(mbserial);
    else {
-      LOG4CXX_DEBUG(coreLogger, "[gui] Mainboard serial was empty. Not appending to base hash data.");
+      LOG4CXX_DEBUG(coreLogger, "Mainboard serial was empty. Not appending to base hash data.");
    }
    LOG4CXX_DEBUG(coreLogger, "[post] Hashing: " << data);
    // generate MD5 hash of data
@@ -330,7 +330,7 @@ void fbgui::performShutDown() {
       file.write("o");
       file.close();
    } else {
-      LOG4CXX_DEBUG(coreLogger, "[gui] Could not open /proc/sysrq-trigger");
+      LOG4CXX_DEBUG(coreLogger, "Could not open /proc/sysrq-trigger");
    }
 }
 //-------------------------------------------------------------------------------------------
@@ -353,7 +353,7 @@ void fbgui::performReboot() {
       file.write("b");
       file.close();
    } else {
-      LOG4CXX_DEBUG(coreLogger, "[gui] Could not open /proc/sysrq-trigger");
+      LOG4CXX_DEBUG(coreLogger, "Could not open /proc/sysrq-trigger");
    }
 }
 //-------------------------------------------------------------------------------------------
@@ -383,52 +383,52 @@ void fbgui::loadSystem() {
  */
 void fbgui::prepareKexec() {
 
-   LOG4CXX_DEBUG(coreLogger, "[gui] Preparing kexec ...");
+   LOG4CXX_DEBUG(coreLogger, "Preparing kexec ...");
    // try to read KCL file that was downloaded.
    QFile file(downloadPath + "/kcl");
    if (!file.open(QIODevice::ReadOnly)) {
-      LOG4CXX_DEBUG(coreLogger, "[gui] No such file: " << file.fileName());
+      LOG4CXX_DEBUG(coreLogger, "No such file: " << file.fileName());
    }
    // everything ok, read data.
    QString kcl = file.readAll();
    file.close();
-   LOG4CXX_DEBUG(coreLogger, "[gui] KCL from PBS: " << kcl);
+   LOG4CXX_DEBUG(coreLogger, "KCL from PBS: " << kcl);
 
    // try to read ipconfig file generated by udhcpc.
    file.setFileName("/tmp/ip_config_fbgui");
    if (!file.open(QIODevice::ReadOnly)) {
-      LOG4CXX_DEBUG(coreLogger, "[gui] No such file: " << file.fileName());
+      LOG4CXX_DEBUG(coreLogger, "No such file: " << file.fileName());
    }
    // everything ok, read data.
    QString ipConfig = file.readAll();
    file.close();
-   LOG4CXX_DEBUG(coreLogger, "[gui] IP config: " << ipConfig);
+   LOG4CXX_DEBUG(coreLogger, "IP config: " << ipConfig);
 
    // append ipConfig
    kcl.append(" ip=");
    kcl.append(ipConfig);
-   LOG4CXX_DEBUG(coreLogger, "[gui] Complete KCL: " << kcl);
+   LOG4CXX_DEBUG(coreLogger, "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()
          + "\"";
-   LOG4CXX_DEBUG(coreLogger, "[gui] kexec cmdline: " << cmdline);
+   LOG4CXX_DEBUG(coreLogger, "kexec cmdline: " << cmdline);
    process->start(cmdline);
    bool ret = process->waitForFinished();
    if (!ret) {
-      LOG4CXX_DEBUG(coreLogger, "[gui] Failed to execute: " << cmdline);
-      LOG4CXX_DEBUG(coreLogger, "[gui] Exiting in 5 seconds...");
+      LOG4CXX_DEBUG(coreLogger, "Failed to execute: " << cmdline);
+      LOG4CXX_DEBUG(coreLogger, "Exiting in 5 seconds...");
       QTimer::singleShot(5000, this, SLOT(close()));
    } else {
-      LOG4CXX_DEBUG(coreLogger, "[gui] Kexec load was successfull.");
+      LOG4CXX_DEBUG(coreLogger, "Kexec load was successfull.");
       if (debugMode < 0) {
          // if process successfully finished, try to run kexec -e
          runKexec();
       } else {
-         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.");
+         LOG4CXX_DEBUG(coreLogger, "Skipping execution of kexec - open debug shell.");
+         LOG4CXX_DEBUG(coreLogger, "To start the system execute \"kexec -e\" in your shell.");
          close();
       }
    }
@@ -444,8 +444,8 @@ void fbgui::runKexec() {
    QProcess *process = new QProcess(this);
    process->start("kexec -e");
    if (!process->waitForStarted()) {
-      LOG4CXX_DEBUG(coreLogger, "[gui] Failed to execute: kexec -e");
-      LOG4CXX_DEBUG(coreLogger, "[gui] Exiting in 5 seconds...");
+      LOG4CXX_DEBUG(coreLogger, "Failed to execute: kexec -e");
+      LOG4CXX_DEBUG(coreLogger, "Exiting in 5 seconds...");
       QTimer::singleShot(5000, this, SLOT(close()));
       //TODO: Handle failure properly...
    }
diff --git a/src/fbgui/javascriptinterface.cpp b/src/fbgui/javascriptinterface.cpp
index 9db803a..3afd3f6 100644
--- a/src/fbgui/javascriptinterface.cpp
+++ b/src/fbgui/javascriptinterface.cpp
@@ -112,7 +112,7 @@ void JavascriptInterface::startDownload(const QString& filename) {
  * @todo add some more informations
  */
 void JavascriptInterface::setCallbackOnFinished(const QString& function) {
-   LOG4CXX_DEBUG(jsiLogger, "[jsi] Callback set: " << function);
+   LOG4CXX_DEBUG(jsiLogger, "Callback set: " << function);
    _callbackOnDownloadsFinished = QString(function);
 }
 //-------------------------------------------------------------------------------------------------------
@@ -217,7 +217,7 @@ void JavascriptInterface::updateProgressBar(const int& percent,
  * on the webpage to receive these.
  */
 void JavascriptInterface::notify(const QString& msg) {
-   LOG4CXX_DEBUG(jsiLogger, "[jsi] Notifying: " << msg);
+   LOG4CXX_DEBUG(jsiLogger, "Notifying: " << msg);
    QString code = QString("notify('\%1')").arg(msg);
    _parent->evaluateJavaScript(code);
 }
@@ -238,7 +238,7 @@ void JavascriptInterface::trigger() {
    QFile file(fileToTriggerURL);
    if (file.open(QIODevice::WriteOnly)) {
       file.write("data\n");
-      LOG4CXX_DEBUG(jsiLogger, "[jsi] *trigger watcher*");
+      LOG4CXX_DEBUG(jsiLogger, "*trigger watcher*");
    }
    file.close();
 }
diff --git a/src/fbgui/ndgui.cpp b/src/fbgui/ndgui.cpp
index 0ff4fdf..d74c433 100644
--- a/src/fbgui/ndgui.cpp
+++ b/src/fbgui/ndgui.cpp
@@ -55,7 +55,6 @@ ndgui::~ndgui() {
  * @brief initialize all variables and prepare everything for a successful run
  */
 void ndgui::init() {
-	_tag = "[nd:ndgui]";
 
 	_started = false;
 	_userChoice = false;
@@ -220,7 +219,7 @@ void ndgui::setUserChoiceTrue() {
  */
 void ndgui::startSingleShot() {
 
-	LOG4CXX_DEBUG(ndLogger, _tag << "start singel shot");
+	LOG4CXX_DEBUG(ndLogger, "start singel shot");
 	QTimer::singleShot(3000, this, SLOT(startNetworkDiscovery()));
 }
 
@@ -241,7 +240,7 @@ void ndgui::startNetworkDiscovery() {
 		_networkDiscovery->initAndRun(gServerIp, _userChoice, gAutoUp,
 				logFilePath, gSocketServerPath, gPathToDhcpExe);
 	} else {
-		LOG4CXX_DEBUG(ndLogger, _tag << "NetworkDiscovery already started");
+		LOG4CXX_DEBUG(ndLogger, "NetworkDiscovery already started");
 	}
 }
 
@@ -272,7 +271,7 @@ void ndgui::handleConnectionEstablished(QString ifName) {
  * handleConnectionEstablished)).
  */
 void ndgui::handleAllProcessesFinished() {
-	LOG4CXX_DEBUG(ndLogger, _tag << "all Processes finished");
+	LOG4CXX_DEBUG(ndLogger, "all Processes finished");
 	_allowUserChoice->setEnabled(false);
 	if (_ifNameList.size() > 0) {
 		if (_userChoice) {
@@ -292,8 +291,8 @@ void ndgui::handleAllProcessesFinished() {
 			}
 		}
 	} else {
-		LOG4CXX_DEBUG(ndLogger, _tag << " No usable interfaces found!: " << _networkDiscovery->GetErrorStr());
-		LOG4CXX_DEBUG(ndLogger, _tag << " list is empty");
+		LOG4CXX_DEBUG(ndLogger, " No usable interfaces found!: " << _networkDiscovery->GetErrorStr());
+		LOG4CXX_DEBUG(ndLogger, " list is empty");
 		abortBoot("No usable interfaces found!"
 				+ _networkDiscovery->GetErrorStr());
 	}
@@ -313,7 +312,7 @@ void ndgui::restartSystem() {
 		file.write("b");
 		file.close();
 	} else {
-		LOG4CXX_DEBUG(ndLogger, _tag << "Could not open /proc/sysrq-trigger");
+		LOG4CXX_DEBUG(ndLogger, "Could not open /proc/sysrq-trigger");
 	}
 }
 
@@ -331,7 +330,7 @@ void ndgui::shutDownSystem() {
 		file.write("o");
 		file.close();
 	} else {
-		LOG4CXX_DEBUG(ndLogger, _tag << "Could not open /proc/sysrq-trigger");
+		LOG4CXX_DEBUG(ndLogger, "Could not open /proc/sysrq-trigger");
 	}
 }
 
@@ -347,7 +346,7 @@ void ndgui::shutDownSystem() {
 //void ndgui::continueBoot(QString ifName, int userChoice) {
 void ndgui::continueBoot(QString ifName) {
 	if (_networkDiscovery->checkConnectivity(ifName)) {
-		LOG4CXX_DEBUG(ndLogger, _tag << " continue with interface: " << ifName);
+		LOG4CXX_DEBUG(ndLogger, " continue with interface: " << ifName);
 		emit initFbgui();
 		this->close();
 	} else {
@@ -363,7 +362,7 @@ void ndgui::continueBoot(QString ifName) {
  * @brief continue the boot sequence without further checking if the connection is still possible.
  */
 void ndgui::continueBootWithoutCheck(QString ifName) {
-	LOG4CXX_DEBUG(ndLogger, _tag << " continue with interface: " << ifName);
+	LOG4CXX_DEBUG(ndLogger, " continue with interface: " << ifName);
 	emit initFbgui();
 	this->close();
 }
@@ -374,7 +373,7 @@ void ndgui::continueBootWithoutCheck(QString ifName) {
  * @brief read the log file. Log File will be presented inside of a dialog.
  */
 QString ndgui::readLogFile() {
-	LOG4CXX_DEBUG(ndLogger, _tag << "show log");
+	LOG4CXX_DEBUG(ndLogger, "show log");
 	return _networkDiscovery->readLogFile();
 }
 
@@ -384,7 +383,7 @@ QString ndgui::readLogFile() {
  * @brief starts the whole application again.
  */
 void ndgui::tryAgain() {
-	LOG4CXX_DEBUG(ndLogger, _tag << " try again ");
+	LOG4CXX_DEBUG(ndLogger, " try again ");
 	_networkDiscovery->prepareTryAgain();
 	if(debugMode > -1) {
 		delete _splitter;
@@ -409,7 +408,7 @@ void ndgui::tryAgain() {
  * dialog.
  */
 QVariantList ndgui::getManualConfInterfaces() {
-	LOG4CXX_DEBUG(ndLogger, _tag << "call getManualConfInterfaces");
+	LOG4CXX_DEBUG(ndLogger, "call getManualConfInterfaces");
 	QVariantList jsonArr;
 	QString debugOut;
 	foreach (QString s, _manConfList) {
@@ -417,7 +416,7 @@ QVariantList ndgui::getManualConfInterfaces() {
 		jsonArr << e;
 		debugOut += s + "; ";
 	}
-	LOG4CXX_DEBUG(ndLogger, _tag << "value of jsonArr:" << debugOut);
+	LOG4CXX_DEBUG(ndLogger, "value of jsonArr:" << debugOut);
 	return jsonArr;
 }
 
@@ -594,5 +593,5 @@ void ndgui::addInterface(const QString &ifName) {
  * @brief just for debugging.
  */
 void ndgui::notifyCall(QString msg){
-	LOG4CXX_DEBUG(ndLogger, _tag << "------ called:" << msg);
+	LOG4CXX_DEBUG(ndLogger, "------ called:" << msg);
 }
diff --git a/src/fbgui/networkdiscovery.cpp b/src/fbgui/networkdiscovery.cpp
index a347adb..429ba89 100644
--- a/src/fbgui/networkdiscovery.cpp
+++ b/src/fbgui/networkdiscovery.cpp
@@ -30,7 +30,6 @@ LoggerPtr ndcLogger(Logger::getLogger("fbgui.nd.core"));
  * constructor
  */
 NetworkDiscovery::NetworkDiscovery(QObject *parent) {
-	_tag = "[nd:NetworkDiscovery]";
 	_server = new QLocalServer(this);
 }
 
@@ -116,7 +115,7 @@ void NetworkDiscovery::initAndRun(QString serverIp, bool userChoice, bool autoUp
 	emit updateStatus("try to create server socket");
 	if (!_server->listen(serverPath)) {
 		// emit signal to the gui that a critial error occoured
-		LOG4CXX_DEBUG(ndcLogger, _tag << " Unable to start server: " << _server->errorString());
+		LOG4CXX_DEBUG(ndcLogger, " Unable to start server: " << _server->errorString());
 		emit
 		abortBoot("Unable to start server: " + _server->errorString());
 		return;
@@ -128,7 +127,7 @@ void NetworkDiscovery::initAndRun(QString serverIp, bool userChoice, bool autoUp
 	emit updateStatus("check if cdhcpcd is available");
 		QFileInfo fInfo(_pathToDhcpcdExe);
 		if (!fInfo.exists()) {
-			LOG4CXX_DEBUG(ndcLogger, _tag << " could not find customdhcpcd exe. Please check the path to this file.");
+			LOG4CXX_DEBUG(ndcLogger, " could not find customdhcpcd exe. Please check the path to this file.");
 			emit abortBoot(
 					"could not find customdhcpcd exe. Please check the path to this file.");
 			return;
@@ -138,7 +137,7 @@ void NetworkDiscovery::initAndRun(QString serverIp, bool userChoice, bool autoUp
 	connect(this, SIGNAL(readyForRun()), this, SLOT(slotReadyForRun()));
 
 	if (args != NULL && !args->isEmpty()) {
-		LOG4CXX_DEBUG(ndcLogger, _tag << "added additional args");
+		LOG4CXX_DEBUG(ndcLogger, "added additional args");
 		_dhcpcdArguments.append(*args);
 	}
 	emit updateStatus("start mainwork");
@@ -184,21 +183,21 @@ void NetworkDiscovery::getListOfNetworkInterfacesWithAutoUp() {
 	if (nIList.size() > 0) {
 		foreach(QNetworkInterface nI, nIList)
 			{
-				LOG4CXX_DEBUG(ndcLogger, _tag << "found Interface:" << nI.humanReadableName());
+				LOG4CXX_DEBUG(ndcLogger, "found Interface:" << nI.humanReadableName());
 				if ((nI.flags() & QNetworkInterface::CanBroadcast)) {
-					LOG4CXX_DEBUG(ndcLogger, _tag << " flags: can broadcast ");
+					LOG4CXX_DEBUG(ndcLogger, " flags: can broadcast ");
 				}
 				if ((nI.flags() & QNetworkInterface::IsLoopBack)) {
-					LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is LoopBack ");
+					LOG4CXX_DEBUG(ndcLogger, " flags: is LoopBack ");
 				}
 				if ((nI.flags() & QNetworkInterface::IsPointToPoint)) {
-					LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is Point to Point ");
+					LOG4CXX_DEBUG(ndcLogger, " flags: is Point to Point ");
 				}
 				if ((nI.flags() & QNetworkInterface::IsRunning)) {
-					LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is Running ");
+					LOG4CXX_DEBUG(ndcLogger, " flags: is Running ");
 				}
 				if ((nI.flags() & QNetworkInterface::IsUp)) {
-					LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is Up ");
+					LOG4CXX_DEBUG(ndcLogger, " flags: is Up ");
 				}
 
 				if (((!(nI.flags() & QNetworkInterface::CanBroadcast)
@@ -212,7 +211,7 @@ void NetworkDiscovery::getListOfNetworkInterfacesWithAutoUp() {
 				}
 				else if (!(nI.flags() & QNetworkInterface::IsUp)) {
 					_networkManager->bringInterfaceUP(nI.humanReadableName());
-					LOG4CXX_DEBUG(ndcLogger, _tag << " interface is down, try to bring up: " << nI.humanReadableName() );
+					LOG4CXX_DEBUG(ndcLogger, " interface is down, try to bring up: " << nI.humanReadableName() );
 					_ifDownList.append(nI.humanReadableName());
 				}
 				else if (!(nI.flags() & QNetworkInterface::IsRunning)) {
@@ -220,7 +219,7 @@ void NetworkDiscovery::getListOfNetworkInterfacesWithAutoUp() {
 				}
 			}
 	} else {
-		LOG4CXX_DEBUG(ndcLogger, _tag << " no interfaces found! ");
+		LOG4CXX_DEBUG(ndcLogger, " no interfaces found! ");
 	}
 }
 
@@ -237,21 +236,21 @@ void NetworkDiscovery::getListOfNetworkInterfaces() {
 	if (nIList.size() > 0) {
 		foreach(QNetworkInterface nI, nIList)
 			{
-				LOG4CXX_DEBUG(ndcLogger, _tag << "found Interface:" << nI.humanReadableName());
+				LOG4CXX_DEBUG(ndcLogger, "found Interface:" << nI.humanReadableName());
 				if ((nI.flags() & QNetworkInterface::CanBroadcast)) {
-					LOG4CXX_DEBUG(ndcLogger, _tag << " flags: can broadcast ");
+					LOG4CXX_DEBUG(ndcLogger, " flags: can broadcast ");
 				}
 				if ((nI.flags() & QNetworkInterface::IsLoopBack)) {
-					LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is LoopBack ");
+					LOG4CXX_DEBUG(ndcLogger, " flags: is LoopBack ");
 				}
 				if ((nI.flags() & QNetworkInterface::IsPointToPoint)) {
-					LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is Point to Point ");
+					LOG4CXX_DEBUG(ndcLogger, " flags: is Point to Point ");
 				}
 				if ((nI.flags() & QNetworkInterface::IsRunning)) {
-					LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is Running ");
+					LOG4CXX_DEBUG(ndcLogger, " flags: is Running ");
 				}
 				if ((nI.flags() & QNetworkInterface::IsUp)) {
-					LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is Up ");
+					LOG4CXX_DEBUG(ndcLogger, " flags: is Up ");
 				}
 				if (((!(nI.flags() & QNetworkInterface::CanBroadcast)
 						|| nI.flags() & QNetworkInterface::IsLoopBack)
@@ -267,7 +266,7 @@ void NetworkDiscovery::getListOfNetworkInterfaces() {
 				}
 			}
 	} else {
-		LOG4CXX_DEBUG(ndcLogger, _tag << " no interfaces found! ");
+		LOG4CXX_DEBUG(ndcLogger, " no interfaces found! ");
 	}
 }
 
@@ -308,17 +307,17 @@ void NetworkDiscovery::checkForIsRunning() {
 void NetworkDiscovery::slotReadyForRun() {
 	if (_ifUpList.size() > 0) {
 		foreach(QString i, _ifUpList) {
-			LOG4CXX_DEBUG(ndcLogger, _tag << " emit addInterface : " << i);
+			LOG4CXX_DEBUG(ndcLogger, " emit addInterface : " << i);
 			emit addInterface(i);
 		}
 		_numberOfProcesses = _ifUpList.size();
 		emit updateStatus("start dhcp client for each interface");
 		runDHCPCD( _ifUpList);
 	} else {
-		LOG4CXX_DEBUG(ndcLogger, _tag << " list is empty. Have not found usable interface. ");
+		LOG4CXX_DEBUG(ndcLogger, " list is empty. Have not found usable interface. ");
 		emit
 		foreach(QString i, _ifDownList) {
-			LOG4CXX_DEBUG(ndcLogger, _tag << " " << i << " is not in running state. (check cable)");
+			LOG4CXX_DEBUG(ndcLogger, " " << i << " is not in running state. (check cable)");
 		}
 		abortBoot("All interfaces are not usable. (e.g. please check if all network cables are plugged in. Read the log for more informations.)");
 		return;
@@ -353,7 +352,7 @@ void NetworkDiscovery::runDHCPCD(QString interface) {
 	_dhcpcdArguments.append(interface);
 	QProcess * p = new QProcess(this);
 
-	LOG4CXX_DEBUG(ndcLogger, _tag << " start cdhcpcd with arguments: " << _dhcpcdArguments.join(", "));
+	LOG4CXX_DEBUG(ndcLogger, " start cdhcpcd with arguments: " << _dhcpcdArguments.join(", "));
 
 	_clientProcessToIfNameMap.insert(p, interface);
 	p->start(_pathToDhcpcdExe, _dhcpcdArguments);
@@ -374,7 +373,7 @@ void NetworkDiscovery::runDHCPCD(QString interface) {
 void NetworkDiscovery::handleProcessStarted() {
 	QProcess* p = qobject_cast<QProcess *> (QObject::sender());
 	QString ifName = _clientProcessToIfNameMap.value(p, "ifName");
-	LOG4CXX_DEBUG(ndcLogger, _tag << " process started for interface: " << ifName);
+	LOG4CXX_DEBUG(ndcLogger, " process started for interface: " << ifName);
 }
 
 
@@ -414,15 +413,15 @@ void NetworkDiscovery::handleProcessFinished(int exitCode,
 	_numberOfProcesses = _numberOfProcesses - 1;
 	if (!_blocked) { //_blocked becomes true, if _userChoice is false and we already found a usable interface
 		if (ifName.compare("ifName") == 0) {
-			LOG4CXX_DEBUG(ndcLogger, _tag << " haven't found process!");
+			LOG4CXX_DEBUG(ndcLogger, " haven't found process!");
 		} else {
-			LOG4CXX_DEBUG(ndcLogger, _tag << " process for interface " << ifName << " finished " << " exit code: " << exitCode << " exit status " << exitStatus);
+			LOG4CXX_DEBUG(ndcLogger, " process for interface " << ifName << " finished " << " exit code: " << exitCode << " exit status " << exitStatus);
 			if (exitCode > 0) {
-				LOG4CXX_DEBUG(ndcLogger, _tag << " process exited unexpected: " << p->errorString());
+				LOG4CXX_DEBUG(ndcLogger, " process exited unexpected: " << p->errorString());
 				emit updateIfStatus(ifName, "process exited unexpected"
 						+ p->errorString());
 			} else {
-				LOG4CXX_DEBUG(ndcLogger, _tag << " process normal exit ");
+				LOG4CXX_DEBUG(ndcLogger, " process normal exit ");
 				emit
 				changeProgressBarValue(ifName, 100);
 				emit
@@ -448,7 +447,7 @@ void NetworkDiscovery::handleProcessFinished(int exitCode,
 			}
 		}
 	} else {
-		LOG4CXX_DEBUG(ndcLogger, _tag << " already blocked");
+		LOG4CXX_DEBUG(ndcLogger, " already blocked");
 		emit updateIfStatus(ifName, "finished DHCP");
 	}
 }
@@ -486,17 +485,17 @@ bool NetworkDiscovery::checkConnectivity(QString ifName) {
 	ifConf->readConfigOutOfFile(pathToGatewayFile);
 
 	// replace default route
-	LOG4CXX_DEBUG(ndcLogger, _tag << "replace default route");
+	LOG4CXX_DEBUG(ndcLogger, "replace default route");
 	_networkManager->replaceDefaultRoute(ifName,
 			ifConf->getGateway(), mss, AF_INET);
 
 	if (checkConnectivityViaTcp(_serverIp)) {
-		LOG4CXX_DEBUG(ndcLogger, _tag << " passed connectivity check! for interface " << ifName);
+		LOG4CXX_DEBUG(ndcLogger, " passed connectivity check! for interface " << ifName);
 		emit
 		updateIfStatus(ifName, "connection possible");
 		return true;
 	} else {
-		LOG4CXX_DEBUG(ndcLogger, _tag << " failed connectivity check! for interface " << ifName);
+		LOG4CXX_DEBUG(ndcLogger, " failed connectivity check! for interface " << ifName);
 		emit
 		updateIfStatus(ifName, "connection not possible");
 		return false;
@@ -524,14 +523,14 @@ bool NetworkDiscovery::checkConnectivityViaTcp() {
  */
 bool NetworkDiscovery::checkConnectivityViaTcp(QString server) {
 	// check connectivity via tcp connection
-	LOG4CXX_DEBUG(ndcLogger, _tag << " check connectivity to server: " << server);
+	LOG4CXX_DEBUG(ndcLogger, " check connectivity to server: " << server);
 	// do host lookup
 	//QHostInfo hostInfo = QHostInfo::fromName(server);
 	QTcpSocket *tcpSocket = new QTcpSocket(this);
-	//LOG4CXX_DEBUG(ndcLogger, _tag << " hostInfo first address: " << hostInfo.addresses().first().toString()); //hostInfo.addresses().first()
+	//LOG4CXX_DEBUG(ndcLogger, " hostInfo first address: " << hostInfo.addresses().first().toString()); //hostInfo.addresses().first()
 	tcpSocket->connectToHost(server, 80);
 	if (!tcpSocket->waitForConnected(500)) {
-		LOG4CXX_DEBUG(ndcLogger, _tag << tcpSocket->errorString());
+		LOG4CXX_DEBUG(ndcLogger, tcpSocket->errorString());
 		_errorStr += tcpSocket->errorString();
 		return false;
 	} else {
@@ -549,12 +548,12 @@ bool NetworkDiscovery::checkConnectivityViaTcp(QString server) {
  * 			a client
  */
 void NetworkDiscovery::handleNewInput(QLocalSocket * client) {
-	LOG4CXX_DEBUG(ndcLogger, _tag << "last read before exit");
+	LOG4CXX_DEBUG(ndcLogger, "last read before exit");
 	while (client->canReadLine()) {
 		QString data(client->readLine());
 
 		data = data.trimmed();
-		LOG4CXX_DEBUG(ndcLogger, _tag << data);
+		LOG4CXX_DEBUG(ndcLogger, data);
 		QStringList lines = data.split("\n");
 
 		for (int i = 0; i < lines.length(); i++) {
@@ -613,7 +612,7 @@ void NetworkDiscovery::handleNewInputLine(QLocalSocket * client, QString data) {
 	QString msg = logMsg.section(";", 3, 3);
 	int st = s_state.trimmed().toInt();
 	int sst = s_subState.trimmed().toInt();
-	//LOG4CXX_DEBUG(ndcLogger, _tag << logMsg);
+	//LOG4CXX_DEBUG(ndcLogger, logMsg);
 
 	if (_ifNameToClient.size() < _numberOfProcesses && !_ifNameToClient.contains(
 			interface)) {
@@ -625,60 +624,60 @@ void NetworkDiscovery::handleNewInputLine(QLocalSocket * client, QString data) {
 		switch (sst) {
 		case DHCP_DISCOVER:
 			emit changeProgressBarValue(interface, 10);
-			LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " send discover");
+			LOG4CXX_DEBUG(ndcLogger, " " << interface << " send discover");
 			break;
 		case DHCP_OFFER:
 			emit changeProgressBarValue(interface, 20);
-			LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " got offer");
+			LOG4CXX_DEBUG(ndcLogger, " " << interface << " got offer");
 			break;
 		case DHCP_REQUEST:
 			emit changeProgressBarValue(interface, 30);
-			LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " send request");
+			LOG4CXX_DEBUG(ndcLogger, " " << interface << " send request");
 			break;
 		case DHCP_ACK:
 			emit changeProgressBarValue(interface, 40);
-			LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " ack");
+			LOG4CXX_DEBUG(ndcLogger, " " << interface << " ack");
 			break;
 		case DHCP_NAK:
 			emit changeProgressBarValue(interface, 40);
-			LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " nak");
+			LOG4CXX_DEBUG(ndcLogger, " " << interface << " nak");
 			break;
 		case DHCPCD_ARP_TEST:
 			emit changeProgressBarValue(interface, 50);
-			LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " do arp test");
+			LOG4CXX_DEBUG(ndcLogger, " " << interface << " do arp test");
 			break;
 		case DHCP_DECLINE:
 			emit changeProgressBarValue(interface, 60);
 			break;
 		case DHCP_RELEASE:
-			LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " release");
+			LOG4CXX_DEBUG(ndcLogger, " " << interface << " release");
 			break;
 		case DHCP_INFORM:
 			break;
 		case DHCPCD_CONFIGURE:
 			emit changeProgressBarValue(interface, 70);
-			LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " do configure interface");
+			LOG4CXX_DEBUG(ndcLogger, " " << interface << " do configure interface");
 			break;
 		case DHCPCD_WRITE:
 			emit changeProgressBarValue(interface, 80);
-			LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " write conf file");
+			LOG4CXX_DEBUG(ndcLogger, " " << interface << " write conf file");
 			break;
 		case DHCPCD_EXIT:
 			emit changeProgressBarValue(interface, 100);
-			LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " exiting");
+			LOG4CXX_DEBUG(ndcLogger, " " << interface << " exiting");
 			break;
 		case DHCPCD_LOG:
-			LOG4CXX_DEBUG(ndcLogger, _tag << " received dhcpcd log: " << msg);
+			LOG4CXX_DEBUG(ndcLogger, " received dhcpcd log: " << msg);
 		default:
-			LOG4CXX_DEBUG(ndcLogger, _tag << " received unknown substatus: " << msg);
+			LOG4CXX_DEBUG(ndcLogger, " received unknown substatus: " << msg);
 			break;
 		}
 		break;
 	case LOG_ERR:
-		LOG4CXX_DEBUG(ndcLogger, _tag << " received error: " << msg);
+		LOG4CXX_DEBUG(ndcLogger, " received error: " << msg);
 		break;
 	default:
-		LOG4CXX_DEBUG(ndcLogger, _tag << " " << logMsg);
+		LOG4CXX_DEBUG(ndcLogger, " " << logMsg);
 		break;
 	}
 }
@@ -722,10 +721,10 @@ int NetworkDiscovery::ip4_setManualConfiguration(QVariantMap result) {
 			result["broadcast"].toString(), result["gateway"].toString(), 0,
 			AF_INET, "/etc/", dns);
 
-	LOG4CXX_DEBUG(ndcLogger, _tag << " set man conf. and check connectivity");
+	LOG4CXX_DEBUG(ndcLogger, " set man conf. and check connectivity");
 
 	if (!checkConnectivityViaTcp(_serverIp)) {
-		LOG4CXX_DEBUG(ndcLogger, _tag << " no connectivity. reset conf.");
+		LOG4CXX_DEBUG(ndcLogger, " no connectivity. reset conf.");
 		interfaceconfiguration * ifc = _ifcMap.value(
 				result["ifname"].toString(), NULL);
 		if (ifc != NULL) {
@@ -739,7 +738,7 @@ int NetworkDiscovery::ip4_setManualConfiguration(QVariantMap result) {
 
 		return 0;
 	}
-	LOG4CXX_DEBUG(ndcLogger, _tag << " emit signal continueBootWithoutCheck(" << result["ifname"].toString() << ")");
+	LOG4CXX_DEBUG(ndcLogger, " emit signal continueBootWithoutCheck(" << result["ifname"].toString() << ")");
 	emit
 	continueBootWithoutCheck(result["ifname"].toString());
 	return 0;
@@ -763,7 +762,7 @@ QString NetworkDiscovery::getGatewayForInterface(QString ifName) {
 		return ifConf->getGateway();
 	}
 	else {
-		LOG4CXX_DEBUG(ndcLogger, _tag << " could not find interface configuration");
+		LOG4CXX_DEBUG(ndcLogger, " could not find interface configuration");
 		return "";
 	}
 
@@ -787,12 +786,12 @@ QString NetworkDiscovery::readLogFile() {
 			}
 		}
 		else {
-			LOG4CXX_DEBUG(ndcLogger, _tag << " could not open log file");
+			LOG4CXX_DEBUG(ndcLogger, " could not open log file");
 			retval = "could not open log file";
 		}
 	}
 	else {
-		LOG4CXX_DEBUG(ndcLogger, _tag << " log file does not exist at: " << _pathToLogFile);
+		LOG4CXX_DEBUG(ndcLogger, " log file does not exist at: " << _pathToLogFile);
 		retval = " log file does not exist at: " + _pathToLogFile;
 	}
 	return retval;
@@ -807,7 +806,7 @@ void NetworkDiscovery::killDHCPCD() {
 	p->start("killall cdhcpcd");
 	p->waitForFinished();
 	if (p->exitCode() > 0)
-		LOG4CXX_DEBUG(ndcLogger, _tag << " [tryAgain] " << p->errorString());
+		LOG4CXX_DEBUG(ndcLogger, " [tryAgain] " << p->errorString());
 
 	delete p;
 }
@@ -822,7 +821,7 @@ void NetworkDiscovery::prepareTryAgain() {
 	/*
 	 foreach(Q_PID pid , _pidsList) {
 	 if (kill(pid,SIGKILL) <= -1)
-	 qDebug() << _tag << " error: trying to kill process: " << pid << " error: " << strerror(errno);
+	 qDebug() << " error: trying to kill process: " << pid << " error: " << strerror(errno);
 	 }
 	 */
 	// reset everything
@@ -876,7 +875,7 @@ QVariantMap NetworkDiscovery::getInterfaceConfig(QString ifName) {
  * connects the client readyRead signal with the handleNewInput slot.
  */
 void NetworkDiscovery::handleNewConnection() {
-	LOG4CXX_DEBUG(ndcLogger, _tag << " New Connection arrived");
+	LOG4CXX_DEBUG(ndcLogger, " New Connection arrived");
 
 	/*QLocalSocket **/
 	_client = _server->nextPendingConnection();
@@ -896,7 +895,7 @@ void NetworkDiscovery::handleClientDisconnect() {
 
 	QLocalSocket * client = _clients.value(socket);
 
-	LOG4CXX_DEBUG(ndcLogger, _tag << " disconnect client");
+	LOG4CXX_DEBUG(ndcLogger, " disconnect client");
 	handleNewInput(client);
 	client->deleteLater();
 }
@@ -952,7 +951,7 @@ QString NetworkDiscovery::GetErrorStr() {
  */
 bool NetworkDiscovery::checkCarrierState(QString interface) {
 
-	LOG4CXX_DEBUG(ndcLogger, _tag << "check carrier state for interface " << interface);
+	LOG4CXX_DEBUG(ndcLogger, "check carrier state for interface " << interface);
 	QByteArray ba = interface.toAscii();
 	const char * iface = ba.data();
 
@@ -976,12 +975,12 @@ bool NetworkDiscovery::checkCarrierState(QString interface) {
 						return false;
 					}
 				} else {
-					LOG4CXX_DEBUG(ndcLogger, _tag << "conversion error");
+					LOG4CXX_DEBUG(ndcLogger, "conversion error");
 				}
 			}
 		}
 	} else {
-		LOG4CXX_DEBUG(ndcLogger, _tag << "attrlist is Null");
+		LOG4CXX_DEBUG(ndcLogger, "attrlist is Null");
 	}
 	sysfs_close_class_device(class_device);
 
diff --git a/src/fbgui/networkmanager.cpp b/src/fbgui/networkmanager.cpp
index 63e5740..ce2186a 100644
--- a/src/fbgui/networkmanager.cpp
+++ b/src/fbgui/networkmanager.cpp
@@ -13,7 +13,6 @@
 NetworkManager::NetworkManager()
 {
   // TODO Auto-generated constructor stub
-  _tag = "[nd:NetworkManager]";
 }
 
 NetworkManager::~NetworkManager()
@@ -60,11 +59,11 @@ NetworkManager::replaceDefaultRoute(QString ifname, QString gateway, int mss,
   QByteArray ba_gw = gateway.toAscii();
   char * gwaddr = ba_gw.data();
 
-  qDebug() << _tag << "---doRoute() gwaddr" << gwaddr;
+  qDebug() << "---doRoute() gwaddr" << gwaddr;
 
   if (!(gw = nl_addr_parse(gwaddr, af)))
     {
-      qDebug() << _tag << "Invalid router address given:" << gwaddr;
+      qDebug() << "Invalid router address given:" << gwaddr;
       return -1;
     }
 
@@ -73,7 +72,7 @@ NetworkManager::replaceDefaultRoute(QString ifname, QString gateway, int mss,
 
   if ((cache = rtnl_link_alloc_cache(rtsock)) == NULL)
     {
-      qDebug() << _tag << "error with link cache alloc \n";
+      qDebug() << "error with link cache alloc \n";
     }
 
   iface_idx = rtnl_link_name2i(cache, ifn);
@@ -89,7 +88,7 @@ NetworkManager::replaceDefaultRoute(QString ifname, QString gateway, int mss,
     }
 
   retval = rtnl_route_add(rtsock, route, NLM_F_REPLACE);
-  qDebug() << _tag << "return value:" << retval << ":" << strerror(-retval);
+  qDebug() << "return value:" << retval << ":" << strerror(-retval);
 
   rtnl_route_put(route);
   nl_addr_put(gw);
@@ -115,7 +114,7 @@ NetworkManager::ip6_addRoute(const char *iface, const struct in6_addr *ip6_dest,
 
   if ((cache = rtnl_link_alloc_cache(nlh)) == NULL)
     {
-      //qDebug() <<  _tag << "error with link cache alloc \n";
+      //qDebug() <<  "error with link cache alloc \n";
       printf("error with link cache alloc \n");
     }
 
@@ -269,7 +268,7 @@ NetworkManager::bringInterfaceUpDown(QString ifname, bool up)
 
   if (!(request = rtnl_link_alloc()))
     {
-      qDebug() << _tag << "error. couldn't allocate a rtnl link";
+      qDebug() << "error. couldn't allocate a rtnl link";
       return -1;
     }
 
@@ -287,20 +286,20 @@ NetworkManager::bringInterfaceUpDown(QString ifname, bool up)
 
   if ((cache = rtnl_link_alloc_cache(rtsock)) == NULL)
     {
-      qDebug() << _tag << "error with link cache alloc ";
+      qDebug() << "error with link cache alloc ";
     }
 
   old = rtnl_link_get_by_name(cache, ifn);
   if (old)
     {
-      qDebug() << _tag << "change link";
+      qDebug() << "change link";
       retval = rtnl_link_change(rtsock, old, request, 0);
     }
   else
     {
-      qDebug() << _tag << "change failed";
+      qDebug() << "change failed";
       retval = -1;
-      qDebug() << _tag << "return value:" << retval << ":" << strerror(-retval);
+      qDebug() << "return value:" << retval << ":" << strerror(-retval);
     }
 
   rtnl_link_put(old);
@@ -384,7 +383,7 @@ NetworkManager::ip4_configureInterface(QString ifname, QString ipAddress,
 
   if ((cache = rtnl_link_alloc_cache(rtsock)) == NULL)
     {
-      qDebug() << _tag << "error with link cache alloc";
+      qDebug() << "error with link cache alloc";
       return -1;
     }
 
@@ -392,7 +391,7 @@ NetworkManager::ip4_configureInterface(QString ifname, QString ipAddress,
 
   if (!(addr = rtnl_addr_alloc()))
     {
-      qDebug() << _tag << "error with addr alloc";
+      qDebug() << "error with addr alloc";
       return -1;
     }
 
@@ -401,11 +400,11 @@ NetworkManager::ip4_configureInterface(QString ifname, QString ipAddress,
   nl_addr_put(local);
   if (err != 0)
     {
-      qDebug() << _tag << "error with set local addr";
+      qDebug() << "error with set local addr";
     }
 
   prefixLength = ip4_netmaskToPrefix(ipAddress, netmask);
-  qDebug() << _tag << "prefix length:" << prefixLength;
+  qDebug() << "prefix length:" << prefixLength;
   rtnl_addr_set_prefixlen(addr, prefixLength);
 
   local = nl_addr_parse(bcaddr, af);
@@ -413,7 +412,7 @@ NetworkManager::ip4_configureInterface(QString ifname, QString ipAddress,
   nl_addr_put(local);
   if (err != 0)
     {
-      qDebug() << _tag << "error with set broadcast addr";
+      qDebug() << "error with set broadcast addr";
     }
 
   rtnl_addr_set_ifindex(addr, iface_idx);
@@ -421,7 +420,7 @@ NetworkManager::ip4_configureInterface(QString ifname, QString ipAddress,
   retval = sync_address(ifn, iface_idx, af, addr);
   if (retval < 0)
     {
-      qDebug() << _tag << "error in sync_address";
+      qDebug() << "error in sync_address";
     }
   rtnl_addr_put(addr);
 
@@ -447,7 +446,7 @@ NetworkManager::ip4_netmaskToPrefix(QString ipAddr, QString netmask)
 
   if (netmask == "")
     {
-      qDebug() << _tag << "error: netmask is empty";
+      qDebug() << "error: netmask is empty";
       return retval;
     }
   nae.setIp(QHostAddress(ipAddr));
@@ -470,7 +469,7 @@ NetworkManager::ip6_addAddress(struct ip6_addr* ip6Addr, const char *iface)
 
   if ((cache = rtnl_link_alloc_cache(rtsock)) == NULL)
     {
-      qDebug() << _tag << "error with link cache alloc";
+      qDebug() << "error with link cache alloc";
       return -1;
     }
 
@@ -639,7 +638,7 @@ nlh  = nl_handle_alloc();
       {
         //nm_log_err (log_domain, "(%s): error %d returned from rtnl_addr_delete(): %s",
         //                        iface, err, nl_geterror ());
-        qDebug() << _tag << "error with delete addr";
+        qDebug() << "error with delete addr";
       }
   }
 
@@ -672,7 +671,7 @@ if (buf_valid == 0)
   {
     //nm_log_dbg (log_domain, "(%s): adding address '%s/%d'",
     //iface, buf, nl_addr_get_prefixlen (nladdr));
-    qDebug() << _tag << "buf valid adding addr";
+    qDebug() << "buf valid adding addr";
   }
 
 err = rtnl_addr_add(nlh, addr, 0);
@@ -681,7 +680,7 @@ if (err < 0)
     //nm_log_err (log_domain,
     // "(%s): error %d returned from rtnl_addr_add():\n%s",
     //          iface, err, nl_geterror ());
-    qDebug() << _tag << "error with add addr" << strerror(-err);
+    qDebug() << "error with add addr" << strerror(-err);
   }
 
 rtnl_addr_put(addr);
@@ -711,7 +710,7 @@ NetworkManager::writeResolvConf(QString path, QString ifname,
 QFile file(path + "resolv.conf");
 if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
   {
-    qDebug() << _tag << "error couldn't open file:" << path;
+    qDebug() << "error couldn't open file:" << path;
     return -1;
   }
 QTextStream out(&file);
diff --git a/src/fbgui/sysinfo.cpp b/src/fbgui/sysinfo.cpp
index 59fe577..80f4a64 100644
--- a/src/fbgui/sysinfo.cpp
+++ b/src/fbgui/sysinfo.cpp
@@ -41,13 +41,13 @@ SysInfo::~SysInfo() {
  * @see JavascriptInterface::getSysInfo(const QString& info)
  */
 const QString SysInfo::getInfo(const QString& infoName) {
-   LOG4CXX_DEBUG(siLogger, "[sysinfo] requested " << infoName);
+   LOG4CXX_DEBUG(siLogger, "requested " << infoName);
    if (infoName == QString("mbserial"))
       return getMainboardSerial();
    else if (infoName == QString("usb"))
       return getUsbVendorIdProductIdSerialNumber();
    /* unknown code */
-   LOG4CXX_DEBUG(siLogger, "[sysinfo] unknown requested");
+   LOG4CXX_DEBUG(siLogger, "unknown requested");
    return "info_error";
 }
 // -----------------------------------------------------------------------------------------------
@@ -83,10 +83,10 @@ const QString SysInfo::getMainboardSerial() {
             out = QString(attr->value);
          }
       }
-      LOG4CXX_DEBUG(siLogger, "[sysinfo] Mainboard Serial: " + out);
+      LOG4CXX_DEBUG(siLogger, "Mainboard Serial: " + out);
       return out;
    }
-   LOG4CXX_DEBUG(siLogger, "[sysinfo] Mainboard Serial: attrlist is null! return: mainboard_serial_error");
+   LOG4CXX_DEBUG(siLogger, "Mainboard Serial: attrlist is null! return: mainboard_serial_error");
    sysfs_close_class_device(class_device);
    return "mainboard_serial_error";
 }
@@ -114,7 +114,7 @@ const QString SysInfo::getMainboardSerial() {
  */
 const QString SysInfo::getUsbVendorIdProductIdSerialNumber() {
 
-   QString tag = "[sysinfo] Usb Serial:";
+   QString tag = "Usb Serial:";
    QString out = "";
    QVariantList list;