backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-07-05 03:17:51 +08:00
Code Issues Projects Releases Wiki Activity

Revert "Moved note into either warning or info #4745"

Browse Source 
This reverts commit d3a4ce1f11.
This commit is contained in:
Jerry (Xinyu Hou)
2015-07-09 13:28:47 -07:00
parent d8582d1093
commit 69a6038cf9
10 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/server/ClientListener.cpp
View File

@@ -55,7 +55,7 @@ ClientListener::ClientListener(const NetworkAddress& address,
if (enableCrypto) {
m_useSecureNetwork = ARCH->plugin().exists(s_networkSecurity);
if (m_useSecureNetwork == false) {
LOG((CLOG_WARN "crypto disabled because of ns plugin not available"));
LOG((CLOG_NOTE "crypto disabled because of ns plugin not available"));
}
}
@@ -147,7 +147,7 @@ ClientListener::handleClientConnecting(const Event&, void*)
return;
}
LOG((CLOG_INFO "accepted client connection"));
LOG((CLOG_NOTE "accepted client connection"));
if (m_useSecureNetwork) {
LOG((CLOG_DEBUG2 "attempting sercure Connection"));

4
src/lib/server/ClientProxy1_0.cpp
View File

@@ -210,7 +210,7 @@ ClientProxy1_0::parseMessage(const UInt8* code)
void
ClientProxy1_0::handleDisconnect(const Event&, void*)
{
LOG((CLOG_INFO "client \"%s\" has disconnected", getName().c_str()));
LOG((CLOG_NOTE "client \"%s\" has disconnected", getName().c_str()));
disconnect();
}
@@ -225,7 +225,7 @@ void
ClientProxy1_0::handleFlatline(const Event&, void*)
{
// didn't get a heartbeat fast enough. assume client is dead.
LOG((CLOG_INFO "client \"%s\" is dead", getName().c_str()));
LOG((CLOG_NOTE "client \"%s\" is dead", getName().c_str()));
disconnect();
}

6
src/lib/server/ClientProxyUnknown.cpp
View File

@@ -270,21 +270,21 @@ ClientProxyUnknown::handleData(const Event&, void*)
void
ClientProxyUnknown::handleWriteError(const Event&, void*)
{
LOG((CLOG_ERR "error communicating with new client"));
LOG((CLOG_NOTE "error communicating with new client"));
sendFailure();
}
void
ClientProxyUnknown::handleTimeout(const Event&, void*)
{
LOG((CLOG_INFO "new client is unresponsive"));
LOG((CLOG_NOTE "new client is unresponsive"));
sendFailure();
}
void
ClientProxyUnknown::handleDisconnect(const Event&, void*)
{
LOG((CLOG_INFO "new client disconnected"));
LOG((CLOG_NOTE "new client disconnected"));
sendFailure();
}

12
src/lib/server/Server.cpp
View File

@@ -206,7 +206,7 @@ Server::Server(
// Determine if scroll lock is already set. If so, lock the cursor to the primary screen
if (m_primaryClient->getToggleMask() & KeyModifierScrollLock) {
LOG((CLOG_INFO "Scroll Lock is on, locking cursor to screen"));
LOG((CLOG_NOTE "Scroll Lock is on, locking cursor to screen"));
m_lockedToScreen = true;
}
@@ -332,7 +332,7 @@ Server::adoptClient(BaseClientProxy* client)
closeClient(client, kMsgEBusy);
return;
}
LOG((CLOG_INFO "client \"%s\" has connected", getName(client).c_str()));
LOG((CLOG_NOTE "client \"%s\" has connected", getName(client).c_str()));
// send configuration options to client
sendOptions(client);
@@ -421,7 +421,7 @@ Server::isLockedToScreen() const
{
// locked if we say we're locked
if (isLockedToScreenServer()) {
LOG((CLOG_INFO "Cursor is locked to screen, check Scroll Lock key"));
LOG((CLOG_NOTE "Cursor is locked to screen, check Scroll Lock key"));
return true;
}
@@ -1384,7 +1384,7 @@ Server::handleClientCloseTimeout(const Event&, void* vclient)
{
// client took too long to disconnect. just dump it.
BaseClientProxy* client = reinterpret_cast<BaseClientProxy*>(vclient);
LOG((CLOG_INFO "forced disconnection of client \"%s\"", getName(client).c_str()));
LOG((CLOG_NOTE "forced disconnection of client \"%s\"", getName(client).c_str()));
removeOldClient(client);
PacketStreamFilter* streamFileter = dynamic_cast<PacketStreamFilter*>(client->getStream());
TCPSocket* socket = dynamic_cast<TCPSocket*>(streamFileter->getStream());
@@ -1481,7 +1481,7 @@ Server::handleLockCursorToScreenEvent(const Event& event, void*)
// enter new state
if (newState != m_lockedToScreen) {
m_lockedToScreen = newState;
LOG((CLOG_INFO "cursor %s current screen", m_lockedToScreen ? "locked to" : "unlocked from"));
LOG((CLOG_NOTE "cursor %s current screen", m_lockedToScreen ? "locked to" : "unlocked from"));
m_primaryClient->reconfigure(getActivePrimarySides());
if (!isLockedToScreenServer()) {
@@ -2152,7 +2152,7 @@ Server::closeClient(BaseClientProxy* client, const char* msg)
// note that this method also works on clients that are not in
// the m_clients list. adoptClient() may call us with such a
// client.
LOG((CLOG_INFO "disconnecting client \"%s\"", getName(client).c_str()));
LOG((CLOG_NOTE "disconnecting client \"%s\"", getName(client).c_str()));
// send message
// FIXME -- avoid type cast (kinda hard, though)