Revert "Moved note into either warning or info #4745"
This reverts commit d3a4ce1f11
.
This commit is contained in:
parent
d8582d1093
commit
69a6038cf9
|
@ -109,7 +109,7 @@ Client::Client(
|
|||
if (m_args.m_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"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -154,7 +154,7 @@ Client::connect()
|
|||
// m_serverAddress will be null if the hostname address is not reolved
|
||||
if (m_serverAddress.getAddress() != NULL) {
|
||||
// to help users troubleshoot, show server host name (issue: 60)
|
||||
LOG((CLOG_INFO "connecting to '%s': %s:%i",
|
||||
LOG((CLOG_NOTE "connecting to '%s': %s:%i",
|
||||
m_serverAddress.getHostname().c_str(),
|
||||
ARCH->addrToString(m_serverAddress.getAddress()).c_str(),
|
||||
m_serverAddress.getPort()));
|
||||
|
|
|
@ -334,7 +334,7 @@ ServerProxy::parseMessage(const UInt8* code)
|
|||
void
|
||||
ServerProxy::handleKeepAliveAlarm(const Event&, void*)
|
||||
{
|
||||
LOG((CLOG_INFO "server is dead"));
|
||||
LOG((CLOG_NOTE "server is dead"));
|
||||
m_client->disconnect("server is not responding");
|
||||
}
|
||||
|
||||
|
|
|
@ -562,7 +562,7 @@ SecureSocket::verifyCertFingerprint()
|
|||
// format fingerprint into hexdecimal format with colon separator
|
||||
String fingerprint(reinterpret_cast<char*>(tempFingerprint), tempFingerprintLen);
|
||||
formatFingerprint(fingerprint);
|
||||
LOG((CLOG_INFO "server fingerprint: %s", fingerprint.c_str()));
|
||||
LOG((CLOG_NOTE "server fingerprint: %s", fingerprint.c_str()));
|
||||
|
||||
String trustedServersFilename;
|
||||
trustedServersFilename = synergy::string::sprintf(
|
||||
|
|
|
@ -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"));
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -313,7 +313,7 @@ bool
|
|||
ArgParser::parseDeprecatedArgs(int argc, const char* const* argv, int& i)
|
||||
{
|
||||
if (isArg(i, argc, argv, NULL, "--crypto-pass")) {
|
||||
LOG((CLOG_WARN "--crypto-pass is deprecated"));
|
||||
LOG((CLOG_NOTE "--crypto-pass is deprecated"));
|
||||
i++;
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -291,7 +291,7 @@ ClientApp::scheduleClientRestart(double retryTime)
|
|||
void
|
||||
ClientApp::handleClientConnected(const Event&, void*)
|
||||
{
|
||||
LOG((CLOG_INFO "connected to server"));
|
||||
LOG((CLOG_NOTE "connected to server"));
|
||||
resetRestartTimeout();
|
||||
updateStatus();
|
||||
}
|
||||
|
@ -321,7 +321,7 @@ ClientApp::handleClientFailed(const Event& e, void*)
|
|||
void
|
||||
ClientApp::handleClientDisconnected(const Event&, void*)
|
||||
{
|
||||
LOG((CLOG_INFO "disconnected from server"));
|
||||
LOG((CLOG_NOTE "disconnected from server"));
|
||||
if (!args().m_restartable) {
|
||||
m_events->addEvent(Event(Event::kQuit));
|
||||
}
|
||||
|
@ -401,7 +401,7 @@ ClientApp::startClient()
|
|||
m_client = openClient(args().m_name,
|
||||
*m_serverAddress, clientScreen);
|
||||
m_clientScreen = clientScreen;
|
||||
LOG((CLOG_INFO "started client"));
|
||||
LOG((CLOG_NOTE "started client"));
|
||||
}
|
||||
|
||||
m_client->connect();
|
||||
|
@ -500,7 +500,7 @@ ClientApp::mainLoop()
|
|||
LOG((CLOG_DEBUG1 "stopping client"));
|
||||
stopClient();
|
||||
updateStatus();
|
||||
LOG((CLOG_INFO "stopped client"));
|
||||
LOG((CLOG_NOTE "stopped client"));
|
||||
|
||||
if (argsBase().m_enableIpc) {
|
||||
cleanupIpcClient();
|
||||
|
|
|
@ -174,7 +174,7 @@ ServerApp::reloadConfig(const Event&, void*)
|
|||
if (m_server != NULL) {
|
||||
m_server->setConfig(*args().m_config);
|
||||
}
|
||||
LOG((CLOG_INFO "reloaded configuration"));
|
||||
LOG((CLOG_NOTE "reloaded configuration"));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -546,7 +546,7 @@ ServerApp::startServer()
|
|||
m_server->setListener(listener);
|
||||
m_listener = listener;
|
||||
updateStatus();
|
||||
LOG((CLOG_INFO "started server, waiting for clients"));
|
||||
LOG((CLOG_NOTE "started server, waiting for clients"));
|
||||
m_serverState = kStarted;
|
||||
return true;
|
||||
}
|
||||
|
@ -774,7 +774,7 @@ ServerApp::mainLoop()
|
|||
m_events->getSystemTarget());
|
||||
cleanupServer();
|
||||
updateStatus();
|
||||
LOG((CLOG_INFO "stopped server"));
|
||||
LOG((CLOG_NOTE "stopped server"));
|
||||
|
||||
if (argsBase().m_enableIpc) {
|
||||
cleanupIpcClient();
|
||||
|
|
Loading…
Reference in New Issue