From a8cf9173c8cb46e54791a7cbe745a297623882be Mon Sep 17 00:00:00 2001 From: "Jerry (Xinyu Hou)" Date: Thu, 9 Jul 2015 13:34:49 -0700 Subject: [PATCH] Revert "Changed note to notify #4745" This reverts commit 5006adedfecedd16c07543d32acffe36aeaf61bb. Conflicts: src/test/unittests/ipc/IpcLogOutputterTests.cpp --- .../MSWindowsClientTaskBarReceiver.cpp | 2 +- .../MSWindowsPortableTaskBarReceiver.cpp | 2 +- .../MSWindowsServerTaskBarReceiver.cpp | 2 +- src/lib/base/ELevel.h | 2 +- src/lib/base/Log.h | 2 +- .../unittests/ipc/IpcLogOutputterTests.cpp | 36 ++++++++++--------- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp b/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp index 965d9eef..7455d8c7 100644 --- a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp +++ b/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp @@ -187,7 +187,7 @@ MSWindowsClientTaskBarReceiver::runMenu(int x, int y) break; case IDC_TASKBAR_LOG_LEVEL_NOTE: - CLOG->setFilter(kNOTIFY); + CLOG->setFilter(kNOTE); break; case IDC_TASKBAR_LOG_LEVEL_INFO: diff --git a/src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.cpp b/src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.cpp index 3a6b4c5e..c09234a2 100644 --- a/src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.cpp +++ b/src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.cpp @@ -204,7 +204,7 @@ MSWindowsPortableTaskBarReceiver::runMenu(int x, int y) break; case IDC_TASKBAR_LOG_LEVEL_NOTE: - CLOG->setFilter(kNOTIFY); + CLOG->setFilter(kNOTE); break; case IDC_TASKBAR_LOG_LEVEL_INFO: diff --git a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp b/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp index 83c73ce3..d7ced073 100644 --- a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp +++ b/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp @@ -218,7 +218,7 @@ MSWindowsServerTaskBarReceiver::runMenu(int x, int y) break; case IDC_TASKBAR_LOG_LEVEL_NOTE: - CLOG->setFilter(kNOTIFY); + CLOG->setFilter(kNOTE); break; case IDC_TASKBAR_LOG_LEVEL_INFO: diff --git a/src/lib/base/ELevel.h b/src/lib/base/ELevel.h index 6c66df6f..c489dffd 100644 --- a/src/lib/base/ELevel.h +++ b/src/lib/base/ELevel.h @@ -27,7 +27,7 @@ enum ELevel { kFATAL, //!< For fatal errors kERROR, //!< For serious errors kWARNING, //!< For minor errors and warnings - kNOTIFY, //!< For messages about notable events + kNOTE, //!< For messages about notable events kINFO, //!< For informational messages kDEBUG, //!< For important debugging messages kDEBUG1, //!< For verbosity +1 debugging messages diff --git a/src/lib/base/Log.h b/src/lib/base/Log.h index 09766130..eaa2c8a8 100644 --- a/src/lib/base/Log.h +++ b/src/lib/base/Log.h @@ -203,7 +203,7 @@ otherwise it expands to a call that doesn't. #define CLOG_CRIT CLOG_TRACE "%z\060" // char is '0' #define CLOG_ERR CLOG_TRACE "%z\061" #define CLOG_WARN CLOG_TRACE "%z\062" -#define CLOG_NOTIFY CLOG_TRACE "%z\063" +#define CLOG_NOTE CLOG_TRACE "%z\063" #define CLOG_INFO CLOG_TRACE "%z\064" #define CLOG_DEBUG CLOG_TRACE "%z\065" #define CLOG_DEBUG1 CLOG_TRACE "%z\066" diff --git a/src/test/unittests/ipc/IpcLogOutputterTests.cpp b/src/test/unittests/ipc/IpcLogOutputterTests.cpp index 5583a0cb..444b506a 100644 --- a/src/test/unittests/ipc/IpcLogOutputterTests.cpp +++ b/src/test/unittests/ipc/IpcLogOutputterTests.cpp @@ -57,9 +57,9 @@ TEST(IpcLogOutputterTests, write_threadingEnabled_bufferIsSent) EXPECT_CALL(mockServer, send(IpcLogLineMessageEq("mock 2\n"), _)).Times(1); IpcLogOutputter outputter(mockServer, true); - outputter.write(kNOTIFY, "mock 1"); + outputter.write(kNOTE, "mock 1"); mockServer.waitForSend(); - outputter.write(kNOTIFY, "mock 2"); + outputter.write(kNOTE, "mock 2"); mockServer.waitForSend(); } @@ -76,9 +76,9 @@ TEST(IpcLogOutputterTests, write_overBufferMaxSize_firstLineTruncated) outputter.bufferMaxSize(2); // log more lines than the buffer can contain - outputter.write(kNOTIFY, "mock 1"); - outputter.write(kNOTIFY, "mock 2"); - outputter.write(kNOTIFY, "mock 3"); + outputter.write(kNOTE, "mock 1"); + outputter.write(kNOTE, "mock 2"); + outputter.write(kNOTE, "mock 3"); outputter.sendBuffer(); } @@ -95,8 +95,8 @@ TEST(IpcLogOutputterTests, write_underBufferMaxSize_allLinesAreSent) outputter.bufferMaxSize(2); // log more lines than the buffer can contain - outputter.write(kNOTIFY, "mock 1"); - outputter.write(kNOTIFY, "mock 2"); + outputter.write(kNOTE, "mock 1"); + outputter.write(kNOTE, "mock 2"); outputter.sendBuffer(); } @@ -118,9 +118,10 @@ TEST(IpcLogOutputterTests, write_overBufferRateLimit_lastLineTruncated) outputter.bufferRateLimit(2, 1); // 1s // log 1 more line than the buffer can accept in time limit. - outputter.write(kNOTIFY, "mock 1"); - outputter.write(kNOTIFY, "mock 2"); - outputter.write(kNOTIFY, "mock 3"); + outputter.write(kNOTE, "mock 1"); + outputter.write(kNOTE, "mock 2"); + outputter.write(kNOTE, "mock 3"); + outputter.sendBuffer(); // after waiting the time limit send another to make sure @@ -128,9 +129,10 @@ TEST(IpcLogOutputterTests, write_overBufferRateLimit_lastLineTruncated) // HACK: sleep causes the unit test to fail intermittently, // so lets try 100ms (there must be a better way to solve this) ARCH->sleep(2); // 2s - outputter.write(kNOTIFY, "mock 4"); - outputter.write(kNOTIFY, "mock 5"); - outputter.write(kNOTIFY, "mock 6"); + outputter.write(kNOTE, "mock 4"); + outputter.write(kNOTE, "mock 5"); + outputter.write(kNOTE, "mock 6"); + outputter.sendBuffer(); } #endif @@ -149,14 +151,14 @@ TEST(IpcLogOutputterTests, write_underBufferRateLimit_allLinesAreSent) outputter.bufferRateLimit(4, 1); // 1s (should be plenty of time) // log 1 more line than the buffer can accept in time limit. - outputter.write(kNOTIFY, "mock 1"); - outputter.write(kNOTIFY, "mock 2"); + outputter.write(kNOTE, "mock 1"); + outputter.write(kNOTE, "mock 2"); outputter.sendBuffer(); // after waiting the time limit send another to make sure // we can log after the time limit passes. - outputter.write(kNOTIFY, "mock 3"); - outputter.write(kNOTIFY, "mock 4"); + outputter.write(kNOTE, "mock 3"); + outputter.write(kNOTE, "mock 4"); outputter.sendBuffer(); }