rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Changed note to notify #4745" 

This reverts commit 5006adedfe.

Conflicts:
	src/test/unittests/ipc/IpcLogOutputterTests.cpp
This commit is contained in:
Jerry (Xinyu Hou) 2015-07-09 13:34:49 -07:00
parent 69a6038cf9
commit a8cf9173c8
6 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp
View File

@ -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:

2
src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.cpp
View File

@ -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:

2
src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp
View File

@ -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:

2
src/lib/base/ELevel.h
View File

@ -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

2
src/lib/base/Log.h
View File

@ -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"

36
src/test/unittests/ipc/IpcLogOutputterTests.cpp
View File

@ -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();
}