Core/Logging: Performance-related tweaks to logging system

    All sLog->out* functions (except outCommand atm) are replaced with TC_LOG_* macros.
    Memleak fix

1 files changed, 46 insertions, 46 deletions

diff --git a/src/server/game/Accounts/RBAC.cpp b/src/server/game/Accounts/RBAC.cpp
index d26d557e2f4..bceae019eec 100644
--- a/src/server/game/Accounts/RBAC.cpp
+++ b/src/server/game/Accounts/RBAC.cpp
@@ -23,11 +23,11 @@ void RBACRole::GrantPermission(uint32 permissionId)
 {

     if (permissionId < RBAC_PERM_MAX)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACRole::GrantPermission (Role %u, Permission %u). Ok", GetId(), permissionId);

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACRole::GrantPermission (Role %u, Permission %u). Ok", GetId(), permissionId);

         _perms.set(permissionId);

     }

     else

-        sLog->outError(LOG_FILTER_RBAC, "RBACRole::GrantPermission (Role %u, Permission %u). Permission not lower than %u",

+        TC_LOG_ERROR(LOG_FILTER_RBAC, "RBACRole::GrantPermission (Role %u, Permission %u). Permission not lower than %u",

                        GetId(), permissionId, RBAC_PERM_MAX);

 }

 

@@ -35,23 +35,23 @@ void RBACRole::RevokePermission(uint32 permissionId)
 {

     if (permissionId < RBAC_PERM_MAX)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACRole::RevokePermission (Role %u, Permission %u). Ok", GetId(), permissionId);

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACRole::RevokePermission (Role %u, Permission %u). Ok", GetId(), permissionId);

         _perms.reset(permissionId);

     }

     else

-        sLog->outError(LOG_FILTER_RBAC, "RBACRole::RevokePermission (Role %u, Permission %u). Permission not lower than %u",

+        TC_LOG_ERROR(LOG_FILTER_RBAC, "RBACRole::RevokePermission (Role %u, Permission %u). Permission not lower than %u",

                        GetId(), permissionId, RBAC_PERM_MAX);

 }

 

 void RBACGroup::GrantRole(uint32 roleId)

 {

-    sLog->outTrace(LOG_FILTER_RBAC, "RBACRole::GrantPermission (Role %u, Permission %u). Ok", GetId(), roleId);

+    TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACRole::GrantPermission (Role %u, Permission %u). Ok", GetId(), roleId);

     _roles.insert(roleId);

 }

 

 void RBACGroup::RevokeRole(uint32 roleId)

 {

-    sLog->outTrace(LOG_FILTER_RBAC, "RBACRole::GrantPermission (Role %u, Permission %u). Ok", GetId(), roleId);

+    TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACRole::GrantPermission (Role %u, Permission %u). Ok", GetId(), roleId);

     _roles.erase(roleId);

 }

 

@@ -61,7 +61,7 @@ RBACCommandResult RBACData::AddGroup(uint32 groupId, int32 realmId /* = 0 */)
     RBACGroup const* group = sAccountMgr->GetRBACGroup(groupId);

     if (!group)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::AddGroup [Id: %u Name: %s] (Group %u, RealmId %d). Group does not exists",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::AddGroup [Id: %u Name: %s] (Group %u, RealmId %d). Group does not exists",

                        GetId(), GetName().c_str(), groupId, realmId);

         return RBAC_ID_DOES_NOT_EXISTS;

     }

@@ -70,7 +70,7 @@ RBACCommandResult RBACData::AddGroup(uint32 groupId, int32 realmId /* = 0 */)
     std::pair<std::set<uint32>::iterator, bool> ret = _groups.insert(groupId);

     if (!ret.second)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::AddGroup [Id: %u Name: %s] (Group %u, RealmId %d). Group Already added",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::AddGroup [Id: %u Name: %s] (Group %u, RealmId %d). Group Already added",

                        GetId(), GetName().c_str(), groupId, realmId);

         return RBAC_CANT_ADD_ALREADY_ADDED;

     }

@@ -78,7 +78,7 @@ RBACCommandResult RBACData::AddGroup(uint32 groupId, int32 realmId /* = 0 */)
     // Do not save to db when loading data from DB (realmId = 0)

     if (realmId)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::AddGroup [Id: %u Name: %s] (Group %u, RealmId %d). Added and DB updated",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::AddGroup [Id: %u Name: %s] (Group %u, RealmId %d). Added and DB updated",

                        GetId(), GetName().c_str(), groupId, realmId);

         PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_RBAC_ACCOUNT_GROUP);

         stmt->setUInt32(0, GetId());

@@ -89,7 +89,7 @@ RBACCommandResult RBACData::AddGroup(uint32 groupId, int32 realmId /* = 0 */)
         CalculateNewPermissions();

     }

     else

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::AddGroup [Id: %u Name: %s] (Group %u, RealmId %d). Added",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::AddGroup [Id: %u Name: %s] (Group %u, RealmId %d). Added",

                        GetId(), GetName().c_str(), groupId, realmId);

 

     return RBAC_OK;

@@ -100,7 +100,7 @@ RBACCommandResult RBACData::RemoveGroup(uint32 groupId, int32 realmId /* = 0 */)
     // could remove it?

     if (!_groups.erase(groupId))

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::RemoveGroup [Id: %u Name: %s] (Group %u, RealmId %d). Group not in list",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::RemoveGroup [Id: %u Name: %s] (Group %u, RealmId %d). Group not in list",

                        GetId(), GetName().c_str(), groupId, realmId);

         return RBAC_CANT_REVOKE_NOT_IN_LIST;

     }

@@ -108,7 +108,7 @@ RBACCommandResult RBACData::RemoveGroup(uint32 groupId, int32 realmId /* = 0 */)
     // Do not save to db when loading data from DB (realmId = 0)

     if (realmId)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::RemoveGroup [Id: %u Name: %s] (Group %u, RealmId %d). Removed and DB updated",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::RemoveGroup [Id: %u Name: %s] (Group %u, RealmId %d). Removed and DB updated",

                        GetId(), GetName().c_str(), groupId, realmId);

         PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_DEL_RBAC_ACCOUNT_GROUP);

         stmt->setUInt32(0, GetId());

@@ -119,7 +119,7 @@ RBACCommandResult RBACData::RemoveGroup(uint32 groupId, int32 realmId /* = 0 */)
         CalculateNewPermissions();

     }

     else

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::RemoveGroup [Id: %u Name: %s] (Group %u, RealmId %d). Removed",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::RemoveGroup [Id: %u Name: %s] (Group %u, RealmId %d). Removed",

                        GetId(), GetName().c_str(), groupId, realmId);

 

     return RBAC_OK;

@@ -131,7 +131,7 @@ RBACCommandResult RBACData::GrantRole(uint32 roleId, int32 realmId /* = 0*/)
     RBACRole const* role = sAccountMgr->GetRBACRole(roleId);

     if (!role)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::GrantRole [Id: %u Name: %s] (Role %u, RealmId %d). Role does not exists",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::GrantRole [Id: %u Name: %s] (Role %u, RealmId %d). Role does not exists",

                        GetId(), GetName().c_str(), roleId, realmId);

         return RBAC_ID_DOES_NOT_EXISTS;

     }

@@ -139,7 +139,7 @@ RBACCommandResult RBACData::GrantRole(uint32 roleId, int32 realmId /* = 0*/)
     // Check if already added in denied list

     if (_deniedRoles.find(roleId) != _deniedRoles.end())

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::GrantRole [Id: %u Name: %s] (Role %u, RealmId %d). Role in deny list",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::GrantRole [Id: %u Name: %s] (Role %u, RealmId %d). Role in deny list",

                        GetId(), GetName().c_str(), roleId, realmId);

         return RBAC_IN_DENIED_LIST;

     }

@@ -148,7 +148,7 @@ RBACCommandResult RBACData::GrantRole(uint32 roleId, int32 realmId /* = 0*/)
     std::pair<std::set<uint32>::iterator, bool> ret = _grantedRoles.insert(roleId);

     if (!ret.second)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::GrantRole [Id: %u Name: %s] (Role %u, RealmId %d). Role already granted",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::GrantRole [Id: %u Name: %s] (Role %u, RealmId %d). Role already granted",

                        GetId(), GetName().c_str(), roleId, realmId);

         return RBAC_CANT_ADD_ALREADY_ADDED;

     }

@@ -156,13 +156,13 @@ RBACCommandResult RBACData::GrantRole(uint32 roleId, int32 realmId /* = 0*/)
     // Do not save to db when loading data from DB (realmId = 0)

     if (realmId)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::GrantRole [Id: %u Name: %s] (Role %u, RealmId %d). Ok and DB updated",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::GrantRole [Id: %u Name: %s] (Role %u, RealmId %d). Ok and DB updated",

                        GetId(), GetName().c_str(), roleId, realmId);

         SaveRole(roleId, true, realmId);

         CalculateNewPermissions();

     }

     else

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::GrantRole [Id: %u Name: %s] (Role %u, RealmId %d). Ok",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::GrantRole [Id: %u Name: %s] (Role %u, RealmId %d). Ok",

                        GetId(), GetName().c_str(), roleId, realmId);

 

     return RBAC_OK;

@@ -174,7 +174,7 @@ RBACCommandResult RBACData::DenyRole(uint32 roleId, int32 realmId /* = 0*/)
     RBACRole const* role = sAccountMgr->GetRBACRole(roleId);

     if (!role)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::DenyRole [Id: %u Name: %s] (Role %u, RealmId %d). Role does not exists",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::DenyRole [Id: %u Name: %s] (Role %u, RealmId %d). Role does not exists",

                        GetId(), GetName().c_str(), roleId, realmId);

         return RBAC_ID_DOES_NOT_EXISTS;

     }

@@ -182,7 +182,7 @@ RBACCommandResult RBACData::DenyRole(uint32 roleId, int32 realmId /* = 0*/)
     // Check if already added in granted list

     if (_grantedRoles.find(roleId) != _grantedRoles.end())

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::DenyRole [Id: %u Name: %s] (Role %u, RealmId %d). Role in grant list",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::DenyRole [Id: %u Name: %s] (Role %u, RealmId %d). Role in grant list",

                        GetId(), GetName().c_str(), roleId, realmId);

         return RBAC_IN_GRANTED_LIST;

     }

@@ -191,7 +191,7 @@ RBACCommandResult RBACData::DenyRole(uint32 roleId, int32 realmId /* = 0*/)
     std::pair<std::set<uint32>::iterator, bool> ret = _deniedRoles.insert(roleId);

     if (!ret.second)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::DenyRole [Id: %u Name: %s] (Role %u, RealmId %d). Role already denied",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::DenyRole [Id: %u Name: %s] (Role %u, RealmId %d). Role already denied",

                        GetId(), GetName().c_str(), roleId, realmId);

         return RBAC_CANT_ADD_ALREADY_ADDED;

     }

@@ -199,13 +199,13 @@ RBACCommandResult RBACData::DenyRole(uint32 roleId, int32 realmId /* = 0*/)
     // Do not save to db when loading data from DB (realmId = 0)

     if (realmId)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::DenyRole [Id: %u Name: %s] (Role %u, RealmId %d). Ok and DB updated",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::DenyRole [Id: %u Name: %s] (Role %u, RealmId %d). Ok and DB updated",

                        GetId(), GetName().c_str(), roleId, realmId);

         SaveRole(roleId, false, realmId);

         CalculateNewPermissions();

     }

     else

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::DenyRole [Id: %u Name: %s] (Role %u, RealmId %d). Ok",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::DenyRole [Id: %u Name: %s] (Role %u, RealmId %d). Ok",

                        GetId(), GetName().c_str(), roleId, realmId);

 

     return RBAC_OK;

@@ -228,7 +228,7 @@ RBACCommandResult RBACData::RevokeRole(uint32 roleId, int32 realmId /* = 0*/)
     // could remove it?

     if (!revoked)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::RevokeRole [Id: %u Name: %s] (Role %u, RealmId %d). Not granted or revoked",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::RevokeRole [Id: %u Name: %s] (Role %u, RealmId %d). Not granted or revoked",

                        GetId(), GetName().c_str(), roleId, realmId);

         return RBAC_CANT_REVOKE_NOT_IN_LIST;

     }

@@ -236,7 +236,7 @@ RBACCommandResult RBACData::RevokeRole(uint32 roleId, int32 realmId /* = 0*/)
     // Do not save to db when loading data from DB (realmId = 0)

     if (realmId)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::RevokeRole [Id: %u Name: %s] (Role %u, RealmId %d). Ok and DB updated",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::RevokeRole [Id: %u Name: %s] (Role %u, RealmId %d). Ok and DB updated",

                        GetId(), GetName().c_str(), roleId, realmId);

         PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_DEL_RBAC_ACCOUNT_ROLE);

         stmt->setUInt32(0, GetId());

@@ -247,7 +247,7 @@ RBACCommandResult RBACData::RevokeRole(uint32 roleId, int32 realmId /* = 0*/)
         CalculateNewPermissions();

     }

     else

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::RevokeRole [Id: %u Name: %s] (Role %u, RealmId %d). Ok",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::RevokeRole [Id: %u Name: %s] (Role %u, RealmId %d). Ok",

                        GetId(), GetName().c_str(), roleId, realmId);

 

     return RBAC_OK;

@@ -259,7 +259,7 @@ RBACCommandResult RBACData::GrantPermission(uint32 permissionId, int32 realmId /
     RBACPermission const* perm = sAccountMgr->GetRBACPermission(permissionId);

     if (!perm)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission does not exists",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission does not exists",

                        GetId(), GetName().c_str(), permissionId, realmId);

         return RBAC_ID_DOES_NOT_EXISTS;

     }

@@ -267,7 +267,7 @@ RBACCommandResult RBACData::GrantPermission(uint32 permissionId, int32 realmId /
     // Check if already added in denied list

     if (_deniedPerms.test(permissionId))

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission in deny list",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission in deny list",

                        GetId(), GetName().c_str(), permissionId, realmId);

         return RBAC_IN_DENIED_LIST;

     }

@@ -275,7 +275,7 @@ RBACCommandResult RBACData::GrantPermission(uint32 permissionId, int32 realmId /
     // Already added?

     if (_grantedPerms.test(permissionId))

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission already granted",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission already granted",

                        GetId(), GetName().c_str(), permissionId, realmId);

         return RBAC_CANT_ADD_ALREADY_ADDED;

     }

@@ -285,13 +285,13 @@ RBACCommandResult RBACData::GrantPermission(uint32 permissionId, int32 realmId /
     // Do not save to db when loading data from DB (realmId = 0)

     if (realmId)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",

                        GetId(), GetName().c_str(), permissionId, realmId);

         SavePermission(permissionId, true, realmId);

         CalculateNewPermissions();

     }

     else

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",

                        GetId(), GetName().c_str(), permissionId, realmId);

 

     return RBAC_OK;

@@ -303,7 +303,7 @@ RBACCommandResult RBACData::DenyPermission(uint32 permissionId, int32 realmId /*
     RBACPermission const* perm = sAccountMgr->GetRBACPermission(permissionId);

     if (!perm)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission does not exists",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission does not exists",

                        GetId(), GetName().c_str(), permissionId, realmId);

         return RBAC_ID_DOES_NOT_EXISTS;

     }

@@ -311,7 +311,7 @@ RBACCommandResult RBACData::DenyPermission(uint32 permissionId, int32 realmId /*
     // Check if already added in granted list

     if (_grantedPerms.test(permissionId))

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission in grant list",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission in grant list",

                        GetId(), GetName().c_str(), permissionId, realmId);

         return RBAC_IN_GRANTED_LIST;

     }

@@ -319,7 +319,7 @@ RBACCommandResult RBACData::DenyPermission(uint32 permissionId, int32 realmId /*
     // Already added?

     if (_deniedPerms.test(permissionId))

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission already denied",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission already denied",

                        GetId(), GetName().c_str(), permissionId, realmId);

         return RBAC_CANT_ADD_ALREADY_ADDED;

     }

@@ -329,13 +329,13 @@ RBACCommandResult RBACData::DenyPermission(uint32 permissionId, int32 realmId /*
     // Do not save to db when loading data from DB (realmId = 0)

     if (realmId)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",

                        GetId(), GetName().c_str(), permissionId, realmId);

         SavePermission(permissionId, false, realmId);

         CalculateNewPermissions();

     }

     else

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",

                        GetId(), GetName().c_str(), permissionId, realmId);

 

     return RBAC_OK;

@@ -356,7 +356,7 @@ RBACCommandResult RBACData::RevokePermission(uint32 permissionId, int32 realmId
     // Check if it's present in any list

     if (!_grantedPerms.test(permissionId) && !_deniedPerms.test(permissionId))

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Not granted or revoked",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Not granted or revoked",

                        GetId(), GetName().c_str(), permissionId, realmId);

         return RBAC_CANT_REVOKE_NOT_IN_LIST;

     }

@@ -367,7 +367,7 @@ RBACCommandResult RBACData::RevokePermission(uint32 permissionId, int32 realmId
     // Do not save to db when loading data from DB (realmId = 0)

     if (realmId)

     {

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",

                        GetId(), GetName().c_str(), permissionId, realmId);

         PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_DEL_RBAC_ACCOUNT_PERMISSION);

         stmt->setUInt32(0, GetId());

@@ -378,7 +378,7 @@ RBACCommandResult RBACData::RevokePermission(uint32 permissionId, int32 realmId
         CalculateNewPermissions();

     }

     else

-        sLog->outTrace(LOG_FILTER_RBAC, "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",

+        TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",

                        GetId(), GetName().c_str(), permissionId, realmId);

 

     return RBAC_OK;

@@ -386,8 +386,8 @@ RBACCommandResult RBACData::RevokePermission(uint32 permissionId, int32 realmId
 

 void RBACData::LoadFromDB()

 {

-    sLog->outInfo(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]", GetId(), GetName().c_str());

-    sLog->outDebug(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]: Loading groups", GetId(), GetName().c_str());

+    TC_LOG_INFO(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]", GetId(), GetName().c_str());

+    TC_LOG_DEBUG(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]: Loading groups", GetId(), GetName().c_str());

 

     // Load account group that affect current realm

     PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_RBAC_ACCOUNT_GROUPS);

@@ -405,7 +405,7 @@ void RBACData::LoadFromDB()
         while (result->NextRow());

     }

 

-    sLog->outDebug(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]: Loading roles", GetId(), GetName().c_str());

+    TC_LOG_DEBUG(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]: Loading roles", GetId(), GetName().c_str());

     // Load account roles (granted and denied) that affect current realm

     stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_RBAC_ACCOUNT_ROLES);

     stmt->setUInt32(0, GetId());

@@ -425,7 +425,7 @@ void RBACData::LoadFromDB()
         while (result->NextRow());

     }

 

-    sLog->outDebug(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]: Loading permissions", GetId(), GetName().c_str());

+    TC_LOG_DEBUG(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]: Loading permissions", GetId(), GetName().c_str());

     // Load account permissions (granted and denied) that affect current realm

     stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_RBAC_ACCOUNT_PERMISSIONS);

     stmt->setUInt32(0, GetId());

@@ -445,13 +445,13 @@ void RBACData::LoadFromDB()
         while (result->NextRow());

     }

 

-    sLog->outDebug(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]: Adding default groups", GetId(), GetName().c_str());

+    TC_LOG_DEBUG(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]: Adding default groups", GetId(), GetName().c_str());

     // Add default groups

     RBACGroupContainer const& groups = sAccountMgr->GetRBACDefaultGroups();

     for (RBACGroupContainer::const_iterator itr = groups.begin(); itr != groups.end(); ++itr)

         AddGroup(*itr);

 

-    sLog->outDebug(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]: Calculating global permissions", GetId(), GetName().c_str());

+    TC_LOG_DEBUG(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]: Calculating global permissions", GetId(), GetName().c_str());

     // Force calculation of permissions, it wasn't performed at load time

     // while adding groups, roles and permissions

     CalculateNewPermissions();

@@ -459,7 +459,7 @@ void RBACData::LoadFromDB()
 

 void RBACData::CalculateNewPermissions()

 {

-    sLog->outTrace(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]: Calculating global permissions", GetId(), GetName().c_str());

+    TC_LOG_TRACE(LOG_FILTER_RBAC, "RBACData::LoadFromDB [Id: %u Name: %s]: Calculating global permissions", GetId(), GetName().c_str());

     // Get the list of directly granted roles

     RBACRoleContainer tempGrantedRoles = GetGrantedRoles();