Core/Remote: Adjust logentries to accomodate separation of info- vs debug-output, using Info-level as default unless it's REAL debugoutput

This commit is contained in:
click committed 2013-02-05 15:45:18 +01:00
1 parent dd0658e675
commit ede65fb60c
2 files changed
+15 -17

No files matched your search

@@ -49,14 +49,14 @@ int RASocket::open(void *)
return -1;
}
sLog->outDebug(LOG_FILTER_REMOTECOMMAND, "Incoming connection from %s", remote_addr.get_host_addr());
sLog->outInfo(LOG_FILTER_REMOTECOMMAND, "Incoming connection from %s", remote_addr.get_host_addr());
return activate();
}
int RASocket::handle_close(ACE_HANDLE, ACE_Reactor_Mask)
{
sLog->outDebug(LOG_FILTER_REMOTECOMMAND, "Closing connection");
sLog->outInfo(LOG_FILTER_REMOTECOMMAND, "Closing connection");
peer().close_reader();
wait();
destroy();
@@ -142,7 +142,7 @@ int RASocket::process_command(const std::string& command)
if (command.length() == 0)
return 0;
sLog->outDebug(LOG_FILTER_REMOTECOMMAND, "Got command: %s", command.c_str());
sLog->outInfo(LOG_FILTER_REMOTECOMMAND, "Received command: %s", command.c_str());
// handle quit, exit and logout commands to terminate connection
if (command == "quit" || command == "exit" || command == "logout") {
@@ -184,15 +184,13 @@ int RASocket::check_access_level(const std::string& user)
AccountMgr::normalizeString(safeUser);
PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_ACCOUNT_ACCESS);
stmt->setString(0, safeUser);
PreparedQueryResult result = LoginDatabase.Query(stmt);
if (!result)
{
sLog->outDebug(LOG_FILTER_REMOTECOMMAND, "User %s does not exist in database", user.c_str());
sLog->outInfo(LOG_FILTER_REMOTECOMMAND, "User %s does not exist in database", user.c_str());
return -1;
}
@@ -200,12 +198,12 @@ int RASocket::check_access_level(const std::string& user)
if (fields[1].GetUInt8() < _minLevel)
{
sLog->outDebug(LOG_FILTER_REMOTECOMMAND, "User %s has no privilege to login", user.c_str());
sLog->outInfo(LOG_FILTER_REMOTECOMMAND, "User %s has no privilege to login", user.c_str());
return -1;
}
else if (fields[2].GetInt32() != -1)
{
sLog->outDebug(LOG_FILTER_REMOTECOMMAND, "User %s has to be assigned on all realms (with RealmID = '-1')", user.c_str());
sLog->outInfo(LOG_FILTER_REMOTECOMMAND, "User %s has to be assigned on all realms (with RealmID = '-1')", user.c_str());
return -1;
}
@@ -231,7 +229,7 @@ int RASocket::check_password(const std::string& user, const std::string& pass)
if (!result)
{
sLog->outDebug(LOG_FILTER_REMOTECOMMAND, "Wrong password for user: %s", user.c_str());
sLog->outInfo(LOG_FILTER_REMOTECOMMAND, "Wrong password for user: %s", user.c_str());
return -1;
}
@@ -254,7 +252,7 @@ int RASocket::authenticate()
if (recv_line(pass) == -1)
return -1;
sLog->outDebug(LOG_FILTER_REMOTECOMMAND, "Login attempt for user: %s", user.c_str());
sLog->outInfo(LOG_FILTER_REMOTECOMMAND, "Login attempt for user: %s", user.c_str());
if (check_access_level(user) == -1)
return -1;
@@ -262,7 +260,7 @@ int RASocket::authenticate()
if (check_password(user, pass) == -1)
return -1;
sLog->outDebug(LOG_FILTER_REMOTECOMMAND, "User login: %s", user.c_str());
sLog->outInfo(LOG_FILTER_REMOTECOMMAND, "User login: %s", user.c_str());
return 0;
}