Made log consistent deskflow#4745

vovazubko · Jun 30, 2015 · 85dc7a5 · 85dc7a5
1 parent 6d5f997
commit 85dc7a5
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 32 deletions.
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
@@ -368,9 +368,14 @@ void MainWindow::updateFound(const QString &version)
 		.arg(version).arg(DOWNLOAD_URL));
 }
 
-void MainWindow::appendLogNote(const QString& text)
+void MainWindow::appendLogInfo(const QString& text)
 {
-	appendLogRaw("NOTE: " + text);
+	appendLogRaw("INFO: " + text);
+}
+
+void MainWindow::appendLogNotify(const QString& text)
+{
+	appendLogRaw("NOTIFY: " + text);
 }
 
 void MainWindow::appendLogDebug(const QString& text) {
@@ -468,13 +473,13 @@ void MainWindow::checkFingerprint(const QString& line)
 void MainWindow::checkTransmission(const QString& line)
 {
 	if (appConfig().logLevel() >= 2) {
-		if (line.contains("Transmission")) {
-			if (line.contains("Started")) {
+		if (line.contains("transmission")) {
+			if (line.contains("started")) {
 				setSynergyState(synergyTransfering);
 			}
-			else if (line.contains("Failed") ||
-					 line.contains("Complete") ||
-					 line.contains("Interrupted")) {
+			else if (line.contains("failed") ||
+					 line.contains("complete") ||
+					 line.contains("interrupted")) {
 				setSynergyState(synergyConnected);
 			}
 		}
@@ -576,20 +581,20 @@ void MainWindow::startSynergy()
 	if (!m_pLogOutput->toPlainText().isEmpty())
 		appendLogRaw("");
 
-	appendLogNote("starting " + QString(synergyType() == synergyServer ? "server" : "client"));
+	appendLogInfo("starting " + QString(synergyType() == synergyServer ? "server" : "client"));
 
 	qDebug() << args;
 
 	// show command if debug log level...
 	if (appConfig().logLevel() >= 2) {
-		appendLogNote(QString("command: %1 %2").arg(app, args.join(" ")));
+		appendLogInfo(QString("command: %1 %2").arg(app, args.join(" ")));
 	}
 
-	appendLogNote("config file: " + configFilename());
-	appendLogNote("log level: " + appConfig().logLevelText());
+	appendLogInfo("config file: " + configFilename());
+	appendLogInfo("log level: " + appConfig().logLevelText());
 
 	if (appConfig().logToFile())
-		appendLogNote("log file: " + appConfig().logFilename());
+		appendLogInfo("log file: " + appConfig().logFilename());
 
 	if (desktopMode)
 	{
@@ -770,7 +775,7 @@ void MainWindow::stopDesktop()
 		return;
 	}
 
-	appendLogNote("stopping synergy desktop process");
+	appendLogInfo("stopping synergy desktop process");
 
 	if (synergyProcess()->isOpen())
 		synergyProcess()->close();
@@ -1321,7 +1326,7 @@ void MainWindow::on_m_pCheckBoxAutoConfig_toggled(bool checked)
 
 void MainWindow::bonjourInstallFinished()
 {
-	appendLogNote("Bonjour install finished");
+	appendLogInfo("Bonjour install finished");
 
 	m_pCheckBoxAutoConfig->setChecked(true);
 }

diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
@@ -111,7 +111,8 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 
 	public slots:
 		void appendLogRaw(const QString& text);
-		void appendLogNote(const QString& text);
+		void appendLogInfo(const QString& text);
+		void appendLogNotify(const QString& text);
 		void appendLogDebug(const QString& text);
 		void appendLogError(const QString& text);
 		void startSynergy();

diff --git a/src/gui/src/ZeroconfService.cpp b/src/gui/src/ZeroconfService.cpp
@@ -79,7 +79,7 @@ void ZeroconfService::serverDetected(const QList<ZeroconfRecord>& list)
 {
 	foreach (ZeroconfRecord record, list) {
 		registerService(false);
-		m_pMainWindow->appendLogNote(tr("zeroconf server detected: %1").arg(
+		m_pMainWindow->appendLogInfo(tr("zeroconf server detected: %1").arg(
 			record.serviceName));
 		m_pMainWindow->serverDetected(record.serviceName);
 	}
@@ -88,7 +88,7 @@ void ZeroconfService::serverDetected(const QList<ZeroconfRecord>& list)
 void ZeroconfService::clientDetected(const QList<ZeroconfRecord>& list)
 {
 	foreach (ZeroconfRecord record, list) {
-		m_pMainWindow->appendLogNote(tr("zeroconf client detected: %1").arg(
+		m_pMainWindow->appendLogInfo(tr("zeroconf client detected: %1").arg(
 			record.serviceName));
 		m_pMainWindow->autoAddScreen(record.serviceName);
 	}

diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp
@@ -285,7 +285,7 @@ Client::leave()
 
 	if (!m_receivedFileData.empty()) {
 		m_receivedFileData.clear();
-		LOG((CLOG_NOTIFY "File Transmission Interrupted: The previous file transmission is interrupted."));
+		LOG((CLOG_NOTIFY "file transmission interrupted"));
 	}
 
 	return true;

diff --git a/src/lib/client/ServerProxy.cpp b/src/lib/client/ServerProxy.cpp
@@ -565,11 +565,11 @@ ServerProxy::setClipboard()
 		clipboard.unmarshall(dataCached, 0);
 		m_client->setClipboard(id, &clipboard);
 
-		LOG((CLOG_NOTIFY "Clipboard Transmission Complete: Clipboard is updated."));
+		LOG((CLOG_NOTIFY "clipboard transmission complete"));
 	}
 	else if (r == kStart) {
 		size_t size = ClipboardChunk::getExpectedSize();
-		LOG((CLOG_NOTIFY "Clipboard Transmission Started: Start receiving %u bytes of clipboard data.", size));
+		LOG((CLOG_NOTIFY "clipboard transmission started: start receiving %u bytes of clipboard data", size));
 	}
 }
 
@@ -873,7 +873,7 @@ ServerProxy::fileChunkReceived()
 	else if (result == kStart) {
 		if (m_client->getDragFileList().size() > 0) {
 			String filename = m_client->getDragFileList().at(0).getFilename();
-			LOG((CLOG_NOTIFY "File Transmission Started: Start receiving %s.", filename.c_str()));
+			LOG((CLOG_NOTIFY "file transmission started: start receiving %s", filename.c_str()));
 		}
 	}
 }

diff --git a/src/lib/server/ClientProxy1_5.cpp b/src/lib/server/ClientProxy1_5.cpp
@@ -93,7 +93,7 @@ ClientProxy1_5::fileChunkReceived()
 	else if (result == kStart) {
 		if (server->getFakeDragFileList().size() > 0) {
 			String filename = server->getFakeDragFileList().at(0).getFilename();
-			LOG((CLOG_NOTIFY "File Transmission Started: Start receiving %s.", filename.c_str()));
+			LOG((CLOG_NOTIFY "file transmission started: start receiving %s", filename.c_str()));
 		}
 	}
 }

diff --git a/src/lib/server/ClientProxy1_6.cpp b/src/lib/server/ClientProxy1_6.cpp
@@ -91,11 +91,11 @@ ClientProxy1_6::recvClipboard()
 		info->m_sequenceNumber = seq;
 		m_events->addEvent(Event(m_events->forClipboard().clipboardChanged(),
 								 getEventTarget(), info));
-		LOG((CLOG_NOTIFY "Clipboard Transmission Complete: Clipboard is updated."));
+		LOG((CLOG_NOTIFY "clipboard transmission complete"));
 	}
 	else if (r == kStart) {
 		size_t size = ClipboardChunk::getExpectedSize();
-		LOG((CLOG_NOTIFY "Clipboard Transmission Started: Start receiving %u bytes of clipboard data.", size));
+		LOG((CLOG_NOTIFY "clipboard transmission started: start receiving %u bytes of clipboard data", size));
 	}
 
 	return true;

diff --git a/src/lib/synergy/ClipboardChunk.cpp b/src/lib/synergy/ClipboardChunk.cpp
@@ -115,13 +115,13 @@ ClipboardChunk::assemble(synergy::IStream* stream,
 		}
 		else if (s_expectedSize != dataCached.size()) {
 			LOG((CLOG_ERR "corrupted clipboard data, expected size=%d actual size=%d", s_expectedSize, dataCached.size()));
-			LOG((CLOG_NOTIFY "Clipboard Transmission Failed: Corrupted clipboard data."));
+			LOG((CLOG_NOTIFY "clipboard transmission failed: corrupted clipboard data"));
 			return kError;
 		}
 		return kFinish;
 	}
 
-	LOG((CLOG_NOTIFY "Clipboard Transmission Failed: Unknow error."));
+	LOG((CLOG_NOTIFY "clipboard transmission failed: unknow error"));
 	return kError;
 }
 

diff --git a/src/lib/synergy/DropHelper.cpp b/src/lib/synergy/DropHelper.cpp
@@ -38,18 +38,18 @@ DropHelper::writeToDir(const String& destination, DragFileList& fileList, String
 		file.open(dropTarget.c_str(), std::ios::out | std::ios::binary);
 		if (!file.is_open()) {
 			LOG((CLOG_ERR "drop file failed: can not open %s", dropTarget.c_str()));
-			LOG((CLOG_NOTIFY "File Transmission Failed: Can not open %s.", dropTarget.c_str()));
+			LOG((CLOG_NOTIFY "file transmission failed: can not open %s", dropTarget.c_str()));
 		}
 
 		file.write(data.c_str(), data.size());
 		file.close();
 
-		LOG((CLOG_NOTIFY "File Transmission Complete: %s is saved to %s.", fileList.at(0).getFilename().c_str(), destination.c_str()));
+		LOG((CLOG_NOTIFY "file transmission complete: %s is saved to %s", fileList.at(0).getFilename().c_str(), destination.c_str()));
 
 		fileList.clear();
 	}
 	else {
 		LOG((CLOG_ERR "drop file failed: drop target is empty"));
-		LOG((CLOG_NOTIFY "File Transmission Failed: Drop target is empty."));
+		LOG((CLOG_NOTIFY "file transmission failed: drop target is empty"));
 	}
 }
diff --git a/src/lib/synergy/FileChunk.cpp b/src/lib/synergy/FileChunk.cpp
@@ -116,7 +116,7 @@ FileChunk::assemble(synergy::IStream* stream, String& dataReceived, size_t& expe
 	case kDataEnd:
 		if (expectedSize != dataReceived.size()) {
 			LOG((CLOG_ERR "corrupted clipboard data, expected size=%d actual size=%d", expectedSize, dataReceived.size()));
-			LOG((CLOG_NOTIFY "File Transmission Failed: Corrupted file data."));
+			LOG((CLOG_NOTIFY "file transmission failed: corrupted file data"));
 			return kError;
 		}
 

diff --git a/src/lib/synergy/StreamChunker.cpp b/src/lib/synergy/StreamChunker.cpp
@@ -82,7 +82,7 @@ StreamChunker::sendFile(
 	while (true) {
 		if (s_interruptFile) {
 			s_interruptFile = false;
-			LOG((CLOG_NOTIFY "File Transmission Interrupted: The previous file transmission is interrupted."));
+			LOG((CLOG_NOTIFY "file transmission interrupted"));
 			break;
 		}
 
@@ -154,7 +154,7 @@ StreamChunker::sendClipboard(
 	while (true) {
 		if (s_interruptClipboard) {
 			s_interruptClipboard = false;
-			LOG((CLOG_NOTIFY "Clipboard Transmission Interrupted: The previous clipboard transmission is interrupted."));
+			LOG((CLOG_NOTIFY "clipboard transmission interrupted"));
 			break;
 		}