GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-26 23:05:37 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #265 from Arkshine/fix/set-log-type

Browse Source 
Retrieve log type in MetaAttach to allow log to be written earlier
This commit is contained in:
Vincent Herbet 2015-07-18 10:21:09 +02:00
commit 075ed7b7b4
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
amxmodx/amxxlog.cpp
View File

@ -112,6 +112,19 @@ void CLog::UseFile(const ke::AString &fileName)
m_LogFile = build_pathname_r(file, sizeof(file) - 1, "%s/%s", g_log_dir.chars(), fileName.chars()); m_LogFile = build_pathname_r(file, sizeof(file) - 1, "%s/%s", g_log_dir.chars(), fileName.chars());
} }
void CLog::SetLogType(const char* localInfo)
{
m_LogType = atoi(get_localinfo(localInfo, "1"));
if (m_LogType < 0 || m_LogType > 3)
{
SET_LOCALINFO(localInfo, "1");
m_LogType = 1;
print_srvconsole("[AMXX] Invalid amxx_logging value; setting back to 1...");
}
}
void CLog::MapChange() void CLog::MapChange()
{ {
// create dir if not existing // create dir if not existing
@ -122,14 +135,7 @@ void CLog::MapChange()
mkdir(build_pathname_r(file, sizeof(file) - 1, "%s", g_log_dir.chars())); mkdir(build_pathname_r(file, sizeof(file) - 1, "%s", g_log_dir.chars()));
#endif #endif
m_LogType = atoi(get_localinfo("amxx_logging", "1")); SetLogType("amxx_logging");
if (m_LogType < 0 || m_LogType > 3)
{
SET_LOCALINFO("amxx_logging", "1");
m_LogType = 1;
print_srvconsole("[AMXX] Invalid amxx_logging value; setting back to 1...");
}
m_LoggedErrMap = false; m_LoggedErrMap = false;

1
amxmodx/amxxlog.h
View File

@ -26,6 +26,7 @@ public:
void CreateNewFile(); void CreateNewFile();
void CloseFile(); void CloseFile();
void SetLogType(const char* localInfo);
void MapChange(); void MapChange();
void Log(const char *fmt, ...); void Log(const char *fmt, ...);
void LogError(const char *fmt, ...); void LogError(const char *fmt, ...);

1
amxmodx/meta_api.cpp
View File

@ -1477,6 +1477,7 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
// ###### Initialize logging here // ###### Initialize logging here
g_log_dir = get_localinfo("amxx_logs", "addons/amxmodx/logs"); g_log_dir = get_localinfo("amxx_logs", "addons/amxmodx/logs");
g_log.SetLogType("amxx_logging");
// ###### Now attach metamod modules // ###### Now attach metamod modules
// This will also call modules Meta_Query and Meta_Attach functions // This will also call modules Meta_Query and Meta_Attach functions