kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

speed up logging

Browse Source 
don't bother processing a line, if the level is too high for any queue
This commit is contained in:
ac-stef
2017-06-27 15:15:21 +02:00
parent 7c54645785
commit 1d1230544b
3 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/log.cpp
+7 -1
View File
@@ -76,13 +76,19 @@ void exitlogging()
enabled = false;
}
bool logcheck(int level)
{
return enabled && level >= 0 && level < ACLOG_NUM && (consolethreshold <= level || (fp && filethreshold <= level) || syslogthreshold <= level);
}
bool logline(int level, const char *msg, ...)
{
if(!enabled) return false;
if(level < 0 || level >= ACLOG_NUM) return false;
bool logtocon = consolethreshold <= level, logtofile = fp && filethreshold <= level, logtosyslog = syslogthreshold <= level;
if(!(logtocon || logtofile || logtosyslog)) return false;
defvformatstring(sf, msg, msg);
filtertext(sf, sf, FTXT__LOG);
bool logtocon = consolethreshold <= level, logtofile = fp && filethreshold <= level, logtosyslog = syslogthreshold <= level;
const char *ts = timestamp ? timestring(true, "%b %d %H:%M:%S ") : "", *ld = levelprefix[level];
char *p, *l = sf;
do
source/src/protos.h
+1
View File
@@ -1109,6 +1109,7 @@ enum { ACLOG_DEBUG = 0, ACLOG_VERBOSE, ACLOG_INFO, ACLOG_WARNING, ACLOG_ERROR, A
extern bool initlogging(const char *identity, int facility_, int consolethres, int filethres, int syslogthres, bool logtimestamp);
extern void exitlogging();
extern bool logcheck(int level);
extern bool logline(int level, const char *msg, ...) PRINTFARGS(2, 3);
// server config
source/src/serverfiles.h
+24 -21
View File
@@ -807,7 +807,7 @@ struct serveripcclist : serverconfigfile
ipranges.remove(i--); continue;
}
}
loopv(ipranges) logline(ACLOG_VERBOSE," %s %s", iprtoa(ipranges[i]), printcomment(ipranges[i]));
if(logcheck(ACLOG_VERBOSE)) loopv(ipranges) logline(ACLOG_VERBOSE," %s %s", iprtoa(ipranges[i]), printcomment(ipranges[i]));
logline(ACLOG_INFO,"read %d (%d) IP list entries from '%s', %d errors, %d concatenated", ipranges.length(), orglength, filename, errors, concatd);
}
@@ -873,7 +873,7 @@ struct serveripblacklist : serverconfigfile
ipranges.remove(i--); continue;
}
}
loopv(ipranges) logline(ACLOG_VERBOSE," %s", iprtoa(ipranges[i]));
if(logcheck(ACLOG_VERBOSE)) loopv(ipranges) logline(ACLOG_VERBOSE," %s", iprtoa(ipranges[i]));
logline(ACLOG_INFO,"read %d (%d) blacklist entries from '%s', %d errors", ipranges.length(), orglength, filename, errors);
}
@@ -978,29 +978,32 @@ struct servernickblacklist : serverconfigfile
line++;
}
DELETEA(buf);
logline(ACLOG_VERBOSE," nickname whitelist (%d entries):", whitelist.numelems);
string text;
enumeratekt(whitelist, const char *, key, int, idx,
if(logcheck(ACLOG_VERBOSE))
{
text[0] = '\0';
for(int i = idx; i >= 0; i = whitelistranges[i].next)
logline(ACLOG_VERBOSE," nickname whitelist (%d entries):", whitelist.numelems);
string text;
enumeratekt(whitelist, const char *, key, int, idx,
{
iprchain &ic = whitelistranges[i];
if(ic.pwd) concatformatstring(text, " pwd:\"%s\"", hiddenpwd(ic.pwd));
else concatformatstring(text, " %s", iprtoa(ic.ipr));
}
logline(ACLOG_VERBOSE, " accept %s%s", key, text);
});
logline(ACLOG_VERBOSE," nickname blacklist (%d entries):", blacklines.length());
loopv(blacklines)
{
text[0] = '\0';
loopj(MAXNICKFRAGMENTS)
text[0] = '\0';
for(int i = idx; i >= 0; i = whitelistranges[i].next)
{
iprchain &ic = whitelistranges[i];
if(ic.pwd) concatformatstring(text, " pwd:\"%s\"", hiddenpwd(ic.pwd));
else concatformatstring(text, " %s", iprtoa(ic.ipr));
}
logline(ACLOG_VERBOSE, " accept %s%s", key, text);
});
logline(ACLOG_VERBOSE," nickname blacklist (%d entries):", blacklines.length());
loopv(blacklines)
{
int k = blacklines[i].frag[j];
if(k >= 0) { concatstring(text, " "); concatstring(text, blfraglist[k]); }
text[0] = '\0';
loopj(MAXNICKFRAGMENTS)
{
int k = blacklines[i].frag[j];
if(k >= 0) { concatstring(text, " "); concatstring(text, blfraglist[k]); }
}
logline(ACLOG_VERBOSE, " %2d block%s%s", blacklines[i].line, blacklines[i].ignorecase ? "i" : "", text);
}
logline(ACLOG_VERBOSE, " %2d block%s%s", blacklines[i].line, blacklines[i].ignorecase ? "i" : "", text);
}
logline(ACLOG_INFO,"read %d + %d entries from nickname blacklist file '%s', %d errors", whitelist.numelems, blacklines.length(), filename, errors);
}