[8797] Merge WorldLog class into Log class.

* Added AuthSocket::SendPacket() function.
 * Packet logging now also possible in realmd.
 * realmd.conf.dist.in updated (added "WorldLogFile" setting).
This commit is contained in:
XTZGZoReX 2009-11-09 02:24:12 +01:00
parent fc42125cfb
commit 07aa44992b
13 changed files with 117 additions and 183 deletions

View file

@ -225,9 +225,9 @@ void Log::Initialize()
}
charLogfile = openLogFile("CharLogFile","CharLogTimestamp","a");
dberLogfile = openLogFile("DBErrorLogFile",NULL,"a");
raLogfile = openLogFile("RaLogFile",NULL,"a");
worldLogfile = openLogFile("WorldLogFile",NULL,"a");
// Main log file settings
m_includeTime = sConfig.GetBoolDefault("LogTime", false);
@ -698,6 +698,21 @@ void Log::outChar(const char * str, ... )
}
}
void Log::outWorld( const char * str, ... )
{
if (!str)
return;
if (worldLogfile)
{
va_list args;
va_start(args, str);
vfprintf(worldLogfile, str, args);
va_end(args);
fflush(worldLogfile);
}
}
void Log::outCharDump( const char * str, uint32 account_id, uint32 guid, const char * name )
{
if(charLogfile)

View file

@ -80,6 +80,10 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
if (raLogfile != NULL)
fclose(raLogfile);
raLogfile = NULL;
if (worldLogfile != NULL)
fclose(worldLogfile);
worldLogfile = NULL;
}
public:
void Initialize();
@ -106,6 +110,8 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
// any log level
void outChar( const char * str, ... ) ATTR_PRINTF(2,3);
// any log level
void outWorld( const char * str, ... ) ATTR_PRINTF(2,3);
// any log level
void outCharDump( const char * str, uint32 account_id, uint32 guid, const char * name );
void outRALog( const char * str, ... ) ATTR_PRINTF(2,3);
void SetLogLevel(char * Level);
@ -118,6 +124,7 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
uint32 getLogFilter() const { return m_logFilter; }
bool IsOutDebug() const { return m_logLevel > 2 || (m_logFileLevel > 2 && logfile); }
bool IsOutCharDump() const { return m_charLog_Dump; }
bool IsLogWorld() const { return (worldLogfile); }
bool IsIncludeTime() const { return m_includeTime; }
private:
FILE* openLogFile(char const* configFileName,char const* configTimeStampFlag, char const* mode);
@ -128,6 +135,7 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
FILE* gmLogfile;
FILE* charLogfile;
FILE* dberLogfile;
FILE* worldLogfile;
// log/console control
uint32 m_logLevel;
@ -152,7 +160,7 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
#define sLog MaNGOS::Singleton<Log>::Instance()
#ifdef MANGOS_DEBUG
#define DEBUG_LOG MaNGOS::Singleton<Log>::Instance().outDebug
#define DEBUG_LOG sLog.outDebug
#else
#define DEBUG_LOG
#endif

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "8796"
#define REVISION_NR "8797"
#endif // __REVISION_NR_H__