sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

cleaned up the way the max log size stuff works and fixed a potential

Browse Source 
problem with varargs usage in Debug()
This commit is contained in:
Andrew Tridgell 0001-01-01 00:00:00 +00:00
parent 234ba85697
commit 8d5a3156ce
1 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
source/lib/util.c
View File

@ -150,6 +150,35 @@ void reopen_logs(void)
}
/*******************************************************************
check if the log has grown too big
********************************************************************/
static void check_log_size(void)
{
static int debug_count=0;
int maxlog;
struct stat st;
if (debug_count++ < 100) return;
maxlog = lp_max_log_size() * 1024;
if (!dbf || maxlog <= 0) return;
if (fstat(fileno(dbf),&st) == 0 && st.st_size > maxlog) {
fclose(dbf); dbf = NULL;
reopen_logs();
if (dbf && file_size(debugf) > maxlog) {
pstring name;
fclose(dbf); dbf = NULL;
sprintf(name,"%s.old",debugf);
sys_rename(debugf,name);
reopen_logs();
}
}
debug_count=0;
}
/*******************************************************************
write an debug message on the debugfile. This is called by the DEBUG
macro
@ -165,45 +194,18 @@ va_dcl
#endif
va_list ap;
#ifdef __STDC__
va_start(ap, format_str);
#else
va_start(ap);
format_str = va_arg(ap,char *);
#endif
if (stdout_logging) {
#ifdef __STDC__
va_start(ap, format_str);
#else
va_start(ap);
format_str = va_arg(ap,char *);
#endif
vfprintf(dbf,format_str,ap);
va_end(ap);
return(0);
}
{
static int debug_count=0;
debug_count++;
if (debug_count == 100) {
int maxlog = lp_max_log_size() * 1024;
if (dbf && maxlog > 0)
{
struct stat st;
if (fstat(fileno(dbf),&st) == 0 && st.st_size > maxlog) {
fclose(dbf); dbf = NULL;
reopen_logs();
if (dbf && file_size(debugf) > maxlog) {
pstring name;
fclose(dbf); dbf = NULL;
sprintf(name,"%s.old",debugf);
sys_rename(debugf,name);
reopen_logs();
}
}
}
debug_count=0;
}
}
#ifdef SYSLOG
if (!lp_syslog_only())
#endif
@ -241,7 +243,14 @@ va_dcl
else
priority = priority_map[syslog_level];
#ifdef __STDC__
va_start(ap, format_str);
#else
va_start(ap);
format_str = va_arg(ap,char *);
#endif
vsprintf(msgbuf, format_str, ap);
va_end(ap);
msgbuf[255] = '\0';
syslog(priority, "%s", msgbuf);
@ -252,11 +261,19 @@ va_dcl
if (!lp_syslog_only())
#endif
{
#ifdef __STDC__
va_start(ap, format_str);
#else
va_start(ap);
format_str = va_arg(ap,char *);
#endif
vfprintf(dbf,format_str,ap);
va_end(ap);
fflush(dbf);
}
va_end(ap);
check_log_size();
return(0);
}