Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplified, should work on linux too now

Browse Source
This commit is contained in:
Pavol Marko
2004-07-13 16:17:38 +00:00
parent 60c6b1703d
commit 4003204ffe
2 changed files with 27 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
amxmodx/amxxlog.cpp
View File

@@ -72,13 +72,6 @@ void CLog::CloseFile()
fclose(fp); fclose(fp);
} }
m_LogFile.clear(); m_LogFile.clear();
#if REOPEN_ON_LOG == 0
if (m_pFile)
{
fclose(m_pFile);
m_pFile = NULL;
}
#endif
} }
} }
@@ -90,13 +83,6 @@ void CLog::CreateNewFile()
time(&td); time(&td);
tm *curTime = localtime(&td); tm *curTime = localtime(&td);
// create dir if not existing
#ifdef __linux
mkdir(build_pathname("%s", g_log_dir.str()), 0700);
#else
mkdir(build_pathname("%s", g_log_dir.str()));
#endif
int i = 0; int i = 0;
while (true) while (true)
{ {
@@ -115,73 +101,23 @@ void CLog::CreateNewFile()
SET_LOCALINFO("amxx_logging", "0"); SET_LOCALINFO("amxx_logging", "0");
} }
fprintf(fp, "AMX Mod X log file started (file \"%s/L%02d%02d%03d.log\") (version \"%s\")\n", g_log_dir.str(), curTime->tm_mon + 1, curTime->tm_mday, i, AMX_VERSION); fprintf(fp, "AMX Mod X log file started (file \"%s/L%02d%02d%03d.log\") (version \"%s\")\n", g_log_dir.str(), curTime->tm_mon + 1, curTime->tm_mday, i, AMX_VERSION);
#if REOPEN_ON_LOG == 1
fclose(fp); fclose(fp);
#else
m_pFile = fp;
#endif
}
void CLog::GetLastFile(int &outMonth, int &outDay, String &outFilename)
{
_finddata_t dat;
outMonth = 0;
outDay = 0;
char filename[260];
intptr_t fh = _findfirst(build_pathname("%s/L*.log", g_log_dir.str()), &dat);
time_t tmpTime=0;
if (fh < 0)
return;
do
{
if (dat.time_write > tmpTime)
{
tmpTime = dat.time_write;
strcpy(filename, dat.name);
}
} while (_findnext(fh, &dat) == 0);
// get filename only (without path)
char *ptr = strrchr(filename, '\\');
char *sourceFile = NULL;
if (ptr)
sourceFile = ptr + 1;
else
{
ptr = strrchr(filename, '/');
if (ptr)
sourceFile = ptr + 1;
else
sourceFile = filename;
}
// store it
char *origSourceFile = sourceFile;
// parse and set output
if (sourceFile[0] != 'L')
return;
++sourceFile;
if (strlen(sourceFile) < 4) // MMDD
return;
outMonth = (sourceFile[1]-'0') + 10*(sourceFile[0]-'0');
outDay = (sourceFile[3]-'0') + 10*(sourceFile[2]-'0');
outFilename.set(origSourceFile);
} }
void CLog::UseFile(const String &fileName) void CLog::UseFile(const String &fileName)
{ {
m_LogFile.set(build_pathname("%s/%s", g_log_dir.str(), fileName.str())); m_LogFile.set(build_pathname("%s/%s", g_log_dir.str(), fileName.str()));
#if REOPEN_ON_LOG == 0
m_pFile = fopen(m_LogFile.str(), "a+");
#endif
} }
void CLog::MapChange() void CLog::MapChange()
{ {
// create dir if not existing
#ifdef __linux
mkdir(build_pathname("%s", g_log_dir.str()), 0700);
#else
mkdir(build_pathname("%s", g_log_dir.str()));
#endif
m_LogType = atoi(get_localinfo("amxx_logging", "1")); m_LogType = atoi(get_localinfo("amxx_logging", "1"));
if (m_LogType < 0 || m_LogType > 3) if (m_LogType < 0 || m_LogType > 3)
{ {
@@ -197,18 +133,6 @@ void CLog::MapChange()
} }
else if (m_LogType == 1) else if (m_LogType == 1)
{ {
int fileMonth, fileDay;
String fileName;
// create new logfile if the last logfile is not from today, otherwise use the old logfile
GetLastFile(fileMonth, fileDay, fileName);
// get current timedate
time_t tmpTime;
time(&tmpTime);
tm *curTime = localtime(&tmpTime);
if (curTime->tm_mon+1 != fileMonth || curTime->tm_mday != fileDay)
CreateNewFile();
else
UseFile(fileName);
Log("-------- Mapchange --------"); Log("-------- Mapchange --------");
} }
else else
@@ -227,27 +151,6 @@ void CLog::Log(const char *fmt, ...)
char date[32]; char date[32];
strftime(date, 31, "%m/%d/%Y - %H:%M:%S", curTime); strftime(date, 31, "%m/%d/%Y - %H:%M:%S", curTime);
#if REOPEN_ON_LOG == 1
FILE *pF = fopen(m_LogFile.str(), "a+");
#else
FILE *pF = m_pFile;
#endif
if (!pF)
{
CreateNewFile();
#if REOPEN_ON_LOG == 1
pF = fopen(m_LogFile.str(), "a+");
#else
pF = m_pFile;
#endif
if (!pF)
{
ALERT(at_logged, "[AMXX] Unexpected fatal logging error (couldn't open %s for a+). AMXX Logging disabled for this map.\n", m_LogFile.str());
m_LogType = 0;
return;
}
}
// msg // msg
char msg[3072]; char msg[3072];
@@ -256,13 +159,29 @@ void CLog::Log(const char *fmt, ...)
vsprintf(msg, fmt, arglst); vsprintf(msg, fmt, arglst);
va_end(arglst); va_end(arglst);
FILE *pF;
if (m_LogType == 2)
{
pF = fopen(m_LogFile.str(), "a+");
if (!pF)
{
CreateNewFile();
pF = fopen(m_LogFile.str(), "a+");
if (!pF)
{
ALERT(at_logged, "[AMXX] Unexpected fatal logging error (couldn't open %s for a+). AMXX Logging disabled for this map.\n", m_LogFile.str());
m_LogType = 0;
return;
}
}
}
else
{
pF = fopen(build_pathname("%s/L%02d%02d.log", g_log_dir.str(), curTime->tm_mon + 1, curTime->tm_mday), "a+");
}
fprintf(pF, "L %s: %s\n", date, msg); fprintf(pF, "L %s: %s\n", date, msg);
#if REOPEN_ON_LOG == 1
fclose(pF); fclose(pF);
#else
fflush(pF);
#endif
// print on server console // print on server console
print_srvconsole("L %s: %s\n", date, msg); print_srvconsole("L %s: %s\n", date, msg);
} }

8
amxmodx/amxxlog.h
View File

@@ -31,19 +31,11 @@
#ifndef __AMXXLOG_H__ #ifndef __AMXXLOG_H__
#define __AMXXLOG_H__ #define __AMXXLOG_H__
// Reopen file on log
// 0: No, only flush
// 1: Yes, complete reopen
#define REOPEN_ON_LOG 0
class CLog class CLog
{ {
private: private:
String m_LogFile; String m_LogFile;
int m_LogType; int m_LogType;
#if REOPEN_ON_LOG == 0
FILE *m_pFile;
#endif
void GetLastFile(int &outMonth, int &outDay, String &outFilename); void GetLastFile(int &outMonth, int &outDay, String &outFilename);
void UseFile(const String &fileName); void UseFile(const String &fileName);