remove obsolete debug msg prefixes

1 files changed, 64 insertions, 65 deletions

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);