More log replacements

This commit is contained in:
Akkadius 2015-01-10 16:01:43 -06:00
parent 18c837c398
commit 26b550dd0d
10 changed files with 14 additions and 13 deletions

View File

@ -651,7 +651,7 @@ bool Client::SendAllPackets() {
eqs->FastQueuePacket((EQApplicationPacket **)&cp->app, cp->ack_req); eqs->FastQueuePacket((EQApplicationPacket **)&cp->app, cp->ack_req);
iterator.RemoveCurrent(); iterator.RemoveCurrent();
#if EQDEBUG >= 6 #if EQDEBUG >= 6
LogFile->write(EQEmuLog::Normal, "Transmitting a packet"); logger.Log(EQEmuLogSys::Normal, "Transmitting a packet");
#endif #endif
} }
return true; return true;
@ -1918,7 +1918,7 @@ void Client::ReadBook(BookRequest_Struct *book) {
if (booktxt2[0] != '\0') { if (booktxt2[0] != '\0') {
#if EQDEBUG >= 6 #if EQDEBUG >= 6
LogFile->write(EQEmuLog::Normal,"Client::ReadBook() textfile:%s Text:%s", txtfile, booktxt2.c_str()); logger.Log(EQEmuLogSys::Normal, "Client::ReadBook() textfile:%s Text:%s", txtfile, booktxt2.c_str());
#endif #endif
EQApplicationPacket* outapp = new EQApplicationPacket(OP_ReadBook, length + sizeof(BookText_Struct)); EQApplicationPacket* outapp = new EQApplicationPacket(OP_ReadBook, length + sizeof(BookText_Struct));
@ -2371,7 +2371,7 @@ uint16 Client::GetMaxSkillAfterSpecializationRules(SkillUseTypes skillid, uint16
Save(); Save();
LogFile->write(EQEmuLog::Normal, "Reset %s's caster specialization skills to 1. " logger.Log(EQEmuLogSys::Normal, "Reset %s's caster specialization skills to 1. "
"Too many specializations skills were above 50.", GetCleanName()); "Too many specializations skills were above 50.", GetCleanName());
} }

View File

@ -9153,7 +9153,7 @@ void Client::Handle_OP_LoadSpellSet(const EQApplicationPacket *app)
void Client::Handle_OP_Logout(const EQApplicationPacket *app) void Client::Handle_OP_Logout(const EQApplicationPacket *app)
{ {
logger.LogDebug(EQEmuLogSys:EQEmuLogSys::Detail, "%s sent a logout packet.", GetName()); logger.LogDebug(EQEmuLogSys::Detail, "%s sent a logout packet.", GetName());
SendLogoutPackets(); SendLogoutPackets();

View File

@ -570,7 +570,7 @@ int command_realdispatch(Client *c, const char *message)
#ifdef COMMANDS_LOGGING #ifdef COMMANDS_LOGGING
if(cur->access >= COMMANDS_LOGGING_MIN_STATUS) { if(cur->access >= COMMANDS_LOGGING_MIN_STATUS) {
LogFile->write(EQEmuLog::Commands, "%s (%s) used command: %s (target=%s)", c->GetName(), c->AccountName(), message, c->GetTarget()?c->GetTarget()->GetName():"NONE"); logger.Log(EQEmuLogSys::Commands, "%s (%s) used command: %s (target=%s)", c->GetName(), c->AccountName(), message, c->GetTarget()?c->GetTarget()->GetName():"NONE");
} }
#endif #endif

View File

@ -645,7 +645,7 @@ int32 ZoneDatabase::GetDoorsDBCountPlusOne(const char *zone_name, int16 version)
} }
bool ZoneDatabase::LoadDoors(int32 iDoorCount, Door *into, const char *zone_name, int16 version) { bool ZoneDatabase::LoadDoors(int32 iDoorCount, Door *into, const char *zone_name, int16 version) {
LogFile->write(EQEmuLog::Status, "Loading Doors from database..."); logger.Log(EQEmuLogSys::Status, "Loading Doors from database...");
// Door tmpDoor; // Door tmpDoor;

View File

@ -11,6 +11,7 @@ Eglin
#ifdef EMBPERL #ifdef EMBPERL
#include "../common/debug.h" #include "../common/debug.h"
#include "../common/eqemu_logsys.h"
#include <cstdio> #include <cstdio>
#include <cstdarg> #include <cstdarg>
#include <vector> #include <vector>

View File

@ -557,7 +557,7 @@ void EntityList::AddGroup(Group *group)
uint32 gid = worldserver.NextGroupID(); uint32 gid = worldserver.NextGroupID();
if (gid == 0) { if (gid == 0) {
LogFile->write(EQEmuLog::Error, logger.Log(EQEmuLogSys::Error,
"Unable to get new group ID from world server. group is going to be broken."); "Unable to get new group ID from world server. group is going to be broken.");
return; return;
} }
@ -586,7 +586,7 @@ void EntityList::AddRaid(Raid *raid)
uint32 gid = worldserver.NextGroupID(); uint32 gid = worldserver.NextGroupID();
if (gid == 0) { if (gid == 0) {
LogFile->write(EQEmuLog::Error, logger.Log(EQEmuLogSys::Error,
"Unable to get new group ID from world server. group is going to be broken."); "Unable to get new group ID from world server. group is going to be broken.");
return; return;
} }

View File

@ -4817,7 +4817,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo
return 0; return 0;
break; break;
default: default:
LogFile->write(EQEmuLog::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]); logger.Log(EQEmuLogSys::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]);
} }
break; break;
@ -5156,7 +5156,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo
//this spits up a lot of garbage when calculating spell focuses //this spits up a lot of garbage when calculating spell focuses
//since they have all kinds of extra effects on them. //since they have all kinds of extra effects on them.
default: default:
LogFile->write(EQEmuLog::Normal, "CalcFocusEffect: unknown effectid %d", focus_spell.effectid[i]); logger.Log(EQEmuLogSys::Normal, "CalcFocusEffect: unknown effectid %d", focus_spell.effectid[i]);
#endif #endif
} }

View File

@ -5040,7 +5040,7 @@ bool Mob::FindType(uint16 type, bool bOffensive, uint16 threshold) {
spells[buffs[i].spellid].base[j], spells[buffs[i].spellid].base[j],
spells[buffs[i].spellid].max[j], spells[buffs[i].spellid].max[j],
buffs[i].casterlevel, buffs[i].spellid); buffs[i].casterlevel, buffs[i].spellid);
LogFile->write(EQEmuLog::Normal, logger.Log(EQEmuLogSys::Normal,
"FindType: type = %d; value = %d; threshold = %d", "FindType: type = %d; value = %d; threshold = %d",
type, value, threshold); type, value, threshold);
if (value < threshold) if (value < threshold)

View File

@ -2696,7 +2696,7 @@ int32 ZoneDatabase::GetBlockedSpellsCount(uint32 zoneid)
bool ZoneDatabase::LoadBlockedSpells(int32 blockedSpellsCount, ZoneSpellsBlocked* into, uint32 zoneid) bool ZoneDatabase::LoadBlockedSpells(int32 blockedSpellsCount, ZoneSpellsBlocked* into, uint32 zoneid)
{ {
LogFile->write(EQEmuLog::Status, "Loading Blocked Spells from database..."); logger.Log(EQEmuLogSys::Status, "Loading Blocked Spells from database...");
std::string query = StringFormat("SELECT id, spellid, type, x, y, z, x_diff, y_diff, z_diff, message " std::string query = StringFormat("SELECT id, spellid, type, x, y, z, x_diff, y_diff, z_diff, message "
"FROM blocked_spells WHERE zoneid = %d ORDER BY id ASC", zoneid); "FROM blocked_spells WHERE zoneid = %d ORDER BY id ASC", zoneid);

View File

@ -347,7 +347,7 @@ void Client::DoZoneSuccess(ZoneChange_Struct *zc, uint16 zone_id, uint32 instanc
if(this->GetPet()) if(this->GetPet())
entity_list.RemoveFromHateLists(this->GetPet()); entity_list.RemoveFromHateLists(this->GetPet());
LogFile->write(EQEmuLog::Status, "Zoning '%s' to: %s (%i) - (%i) x=%f, y=%f, z=%f", m_pp.name, database.GetZoneName(zone_id), zone_id, instance_id, dest_x, dest_y, dest_z); logger.Log(EQEmuLogSys::Status, "Zoning '%s' to: %s (%i) - (%i) x=%f, y=%f, z=%f", m_pp.name, database.GetZoneName(zone_id), zone_id, instance_id, dest_x, dest_y, dest_z);
//set the player's coordinates in the new zone so they have them //set the player's coordinates in the new zone so they have them
//when they zone into it //when they zone into it