More logging changes [skip ci]

This commit is contained in:
Akkadius 2019-09-07 01:59:50 -05:00
parent b8216a5d40
commit 9e3f9f9749
3 changed files with 17 additions and 16 deletions

View File

@ -443,9 +443,7 @@ bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app)
// Could use a Logging Out Completely message somewhere. // Could use a Logging Out Completely message somewhere.
cle->SetOnline(CLE_Status::CharSelect); cle->SetOnline(CLE_Status::CharSelect);
Log(Logs::General, Logs::WorldServer, LogInfo("Account ({}) Logging({}) to character select :: LSID [{}] ",cle->AccountName(), inout, cle->LSID());
"Account (%s) Logging(%s) to character select :: LSID: %d ",
cle->AccountName(), inout, cle->LSID());
} }
else { else {
cle->SetOnline(); cle->SetOnline();
@ -1200,8 +1198,8 @@ void Client::EnterWorld(bool TryBootup) {
cle->SetChar(charid, char_name); cle->SetChar(charid, char_name);
database.UpdateLiveChar(char_name, GetAccountID()); database.UpdateLiveChar(char_name, GetAccountID());
Log(Logs::General, Logs::WorldServer, LogInfo(,
"(%s) %s %s (Zone ID %d: Instance ID: %d) ", "({}) [{}] [{}] (Zone ID [{}]: Instance ID: [{}]) ",
char_name, char_name,
(seen_character_select ? "Zoning from character select" : "Zoning to"), (seen_character_select ? "Zoning from character select" : "Zoning to"),
zone_name, zone_name,

View File

@ -83,8 +83,8 @@ ClientListEntry::ClientListEntry(
memset(pLFGComments, 0, 64); memset(pLFGComments, 0, 64);
} }
ClientListEntry::ClientListEntry(uint32 in_id, ZoneServer* iZS, ServerClientList_Struct* scl, CLE_Status iOnline) ClientListEntry::ClientListEntry(uint32 in_id, ZoneServer *iZS, ServerClientList_Struct *scl, CLE_Status iOnline)
: id(in_id) : id(in_id)
{ {
ClearVars(true); ClearVars(true);
@ -129,7 +129,8 @@ void ClientListEntry::SetChar(uint32 iCharID, const char *iCharName)
strn0cpy(pname, iCharName, sizeof(pname)); strn0cpy(pname, iCharName, sizeof(pname));
} }
void ClientListEntry::SetOnline(ZoneServer* iZS, CLE_Status iOnline) { void ClientListEntry::SetOnline(ZoneServer *iZS, CLE_Status iOnline)
{
if (iZS == this->Server()) { if (iZS == this->Server()) {
SetOnline(iOnline); SetOnline(iOnline);
} }
@ -137,12 +138,12 @@ void ClientListEntry::SetOnline(ZoneServer* iZS, CLE_Status iOnline) {
void ClientListEntry::SetOnline(CLE_Status iOnline) void ClientListEntry::SetOnline(CLE_Status iOnline)
{ {
Log(Logs::General, LogInfo(
Logs::WorldServer, "ClientListEntry::SetOnline for {}({}) = {}",
"ClientListEntry::SetOnline for %s(%i) = %i",
AccountName(), AccountName(),
AccountID(), AccountID(),
iOnline); iOnline
);
if (iOnline >= CLE_Status::Online && pOnline < CLE_Status::Online) { if (iOnline >= CLE_Status::Online && pOnline < CLE_Status::Online) {
numplayers++; numplayers++;
@ -193,7 +194,8 @@ void ClientListEntry::LSZoneChange(ZoneToZone_Struct *ztz)
} }
} }
void ClientListEntry::Update(ZoneServer* iZS, ServerClientList_Struct* scl, CLE_Status iOnline) { void ClientListEntry::Update(ZoneServer *iZS, ServerClientList_Struct *scl, CLE_Status iOnline)
{
if (pzoneserver != iZS) { if (pzoneserver != iZS) {
if (pzoneserver) { if (pzoneserver) {
pzoneserver->RemovePlayer(); pzoneserver->RemovePlayer();
@ -259,7 +261,7 @@ void ClientListEntry::ClearVars(bool iAll)
{ {
if (iAll) { if (iAll) {
pOnline = CLE_Status::Never; pOnline = CLE_Status::Never;
stale = 0; stale = 0;
pLSID = 0; pLSID = 0;
memset(loginserver_account_name, 0, sizeof(loginserver_account_name)); memset(loginserver_account_name, 0, sizeof(loginserver_account_name));
@ -307,8 +309,9 @@ bool ClientListEntry::CheckStale()
{ {
stale++; stale++;
if (stale > 20) { if (stale > 20) {
if (pOnline > CLE_Status::Offline) if (pOnline > CLE_Status::Offline) {
SetOnline(CLE_Status::Offline); SetOnline(CLE_Status::Offline);
}
return true; return true;
} }

View File

@ -546,7 +546,7 @@ int main(int argc, char** argv) {
eqsm.OnNewConnection([&stream_identifier](std::shared_ptr<EQ::Net::EQStream> stream) { eqsm.OnNewConnection([&stream_identifier](std::shared_ptr<EQ::Net::EQStream> stream) {
stream_identifier.AddStream(stream); stream_identifier.AddStream(stream);
LogF(Logs::Detail, Logs::WorldServer, "New connection from IP {0}:{1}", stream->GetRemoteIP(), ntohs(stream->GetRemotePort())); LogInfo("New connection from IP {0}:{1}", stream->GetRemoteIP(), ntohs(stream->GetRemotePort()));
}); });
while (RunLoops) { while (RunLoops) {