rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-15 18:40:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

mysql connect error messages enhanced (now go to the log themselves)

Browse Source
This commit is contained in:
Rainer Gerhards 2005-08-04 15:35:27 +00:00
parent 4568079aab
commit b6c5d998a8
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -17,8 +17,8 @@ CC= gcc
# enables the MySQL code. By default, that one is commented out
# change the comment chars to activate it if you need MySQL!
# In this case, also look down further to uncomment the libs
CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce $(NOLARGEFILE)
#CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -DWITH_DB -I/usr/local/include $(NOLARGEFILE)
#CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce $(NOLARGEFILE)
CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -DWITH_DB -I/usr/local/include $(NOLARGEFILE)
LDFLAGS= -s
INSTALL = install
@ -26,7 +26,7 @@ BINDIR = /usr/sbin
MANDIR = /usr/share/man
# Uncomment the following to use mysql.
#LIBS = -lmysqlclient -L/usr/local/lib/mysql
LIBS = -lmysqlclient -L/usr/local/lib/mysql
# There is one report that under an all ELF system there may be a need to
# explicilty link with libresolv.a. If linking syslogd fails you may wish

10
syslogd.c
View File

@ -2416,7 +2416,7 @@ int main(argc, argv)
* release. Value 1 might be used if you would like to keep debug
* mode enabled during testing.
*/
debugging_on = 0;
debugging_on = 1;
}
/*
* Send a signal to the parent to it can terminate.
@ -5480,6 +5480,7 @@ void writeMySQL(register struct filed *f)
*/
void DBErrorHandler(register struct filed *f)
{
char errMsg[512];
/* TODO:
* NO DB connection -> Can not log to DB
* --------------------
@ -5503,8 +5504,11 @@ void DBErrorHandler(register struct filed *f)
*
* Think about diffrent "delay" for diffrent errors!
*/
dprintf("db error no: %d\n", mysql_errno(&f->f_hmysql));
dprintf("db error: %s\n", mysql_error(&f->f_hmysql));
errno = 0;
snprintf(errMsg, sizeof(errMsg)/sizeof(char),
"db error (%d): %s\n", mysql_errno(&f->f_hmysql),
mysql_error(&f->f_hmysql));
logerror(errMsg);
/* Enable "delay" */
f->f_timeResumeOnError = time(&f->f_timeResumeOnError) + _DB_DELAYTIMEONERROR ;
f->f_iLastDBErrNo = mysql_errno(&f->f_hmysql);