mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-23 10:26:28 +01:00
*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget --HG-- branch : trunk
This commit is contained in:
@@ -17,69 +17,56 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
/** \file
|
||||
\ingroup u2w
|
||||
*/
|
||||
|
||||
#include "WorldLog.h"
|
||||
#include "Policies/SingletonImp.h"
|
||||
#include "Config/ConfigEnv.h"
|
||||
#include "Log.h"
|
||||
|
||||
#define CLASS_LOCK MaNGOS::ClassLevelLockable<WorldLog, ACE_Thread_Mutex>
|
||||
INSTANTIATE_SINGLETON_2(WorldLog, CLASS_LOCK);
|
||||
INSTANTIATE_CLASS_MUTEX(WorldLog, ACE_Thread_Mutex);
|
||||
|
||||
WorldLog::WorldLog() : i_file(NULL)
|
||||
{
|
||||
Initialize();
|
||||
}
|
||||
|
||||
WorldLog::~WorldLog()
|
||||
{
|
||||
if( i_file != NULL )
|
||||
fclose(i_file);
|
||||
i_file = NULL;
|
||||
}
|
||||
|
||||
/// Open the log file (if specified so in the configuration file)
|
||||
void WorldLog::Initialize()
|
||||
{
|
||||
std::string logsDir = sConfig.GetStringDefault("LogsDir","");
|
||||
|
||||
if(!logsDir.empty())
|
||||
{
|
||||
if((logsDir.at(logsDir.length()-1)!='/') && (logsDir.at(logsDir.length()-1)!='\\'))
|
||||
logsDir.append("/");
|
||||
}
|
||||
|
||||
std::string logname = sConfig.GetStringDefault("WorldLogFile", "");
|
||||
if(!logname.empty())
|
||||
{
|
||||
i_file = fopen((logsDir+logname).c_str(), "w");
|
||||
}
|
||||
|
||||
m_dbWorld = sConfig.GetBoolDefault("LogDB.World", false); // can be VERY heavy if enabled
|
||||
}
|
||||
|
||||
void WorldLog::outTimestampLog(char const *fmt, ...)
|
||||
{
|
||||
if( LogWorld() )
|
||||
{
|
||||
Guard guard(*this);
|
||||
ASSERT(i_file);
|
||||
|
||||
Log::outTimestamp(i_file);
|
||||
va_list args;
|
||||
va_start(args, fmt);
|
||||
vfprintf(i_file, fmt, args);
|
||||
//fprintf(i_file, "\n" );
|
||||
va_end(args);
|
||||
|
||||
fflush(i_file);
|
||||
}
|
||||
|
||||
if (sLog.GetLogDB() && m_dbWorld)
|
||||
{
|
||||
va_list ap2;
|
||||
@@ -90,23 +77,19 @@ void WorldLog::outTimestampLog(char const *fmt, ...)
|
||||
va_end(ap2);
|
||||
}
|
||||
}
|
||||
|
||||
void WorldLog::outLog(char const *fmt, ...)
|
||||
{
|
||||
if( LogWorld() )
|
||||
{
|
||||
Guard guard(*this);
|
||||
ASSERT(i_file);
|
||||
|
||||
va_list args;
|
||||
va_start(args, fmt);
|
||||
vfprintf(i_file, fmt, args);
|
||||
//fprintf(i_file, "\n" );
|
||||
va_end(args);
|
||||
|
||||
fflush(i_file);
|
||||
}
|
||||
|
||||
if (sLog.GetLogDB() && m_dbWorld)
|
||||
{
|
||||
va_list ap2;
|
||||
@@ -117,6 +100,5 @@ void WorldLog::outLog(char const *fmt, ...)
|
||||
va_end(ap2);
|
||||
}
|
||||
}
|
||||
|
||||
#define sWorldLog WorldLog::Instance()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user