summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2005-04-19 08:35:15 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2005-04-19 08:35:15 +0000
commit01a4d3e17d45539e97afb783118882ea12308801 (patch)
tree2c5f7f360fc36d90f80df572f77b3426038da130
parent2a2ea967d8f5bf5bfe27ce3d0f5f2a971efde661 (diff)
downloadrsyslog-01a4d3e17d45539e97afb783118882ea12308801.tar.gz
rsyslog-01a4d3e17d45539e97afb783118882ea12308801.tar.xz
rsyslog-01a4d3e17d45539e97afb783118882ea12308801.zip
debug output updates
-rw-r--r--syslogd.c13
-rw-r--r--version.h2
2 files changed, 7 insertions, 8 deletions
diff --git a/syslogd.c b/syslogd.c
index 01bbdfba..6b63497f 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -1411,7 +1411,7 @@ struct msg* MsgConstruct()
getCurrTime(&(pM->tRcvdAt));
}
- dprintf("MsgConstruct\t0x%x\n", (int)pM);
+ /* DEV debugging only! dprintf("MsgConstruct\t0x%x\n", (int)pM);*/
return(pM);
}
@@ -1423,10 +1423,10 @@ struct msg* MsgConstruct()
void MsgDestruct(struct msg * pM)
{
assert(pM != NULL);
- dprintf("MsgDestruct\t0x%x, Ref now: %d\n", (int)pM, pM->iRefCount - 1);
+ /* DEV Debugging only ! dprintf("MsgDestruct\t0x%x, Ref now: %d\n", (int)pM, pM->iRefCount - 1); */
if(--pM->iRefCount == 0)
{
- dprintf("MsgDestruct\t0x%x, RefCount now 0, doing DESTROY\n", (int)pM);
+ /* DEV Debugging Only! dprintf("MsgDestruct\t0x%x, RefCount now 0, doing DESTROY\n", (int)pM); */
if(pM->pszUxTradMsg != NULL)
free(pM->pszUxTradMsg);
if(pM->pszRawMsg != NULL)
@@ -1472,7 +1472,7 @@ struct msg *MsgAddRef(struct msg *pM)
{
assert(pM != NULL);
pM->iRefCount++;
- dprintf("MsgAddRef\t0x%x done, Ref now: %d\n", (int)pM, pM->iRefCount);
+ /* DEV debugging only! dprintf("MsgAddRef\t0x%x done, Ref now: %d\n", (int)pM, pM->iRefCount);*/
return(pM);
}
@@ -2342,7 +2342,7 @@ int main(argc, argv)
if ( debugging_on )
{
- dprintf("Calling select, active file descriptors (max %d): ", maxfds);
+ dprintf("----------------------------------------\nCalling select, active file descriptors (max %d): ", maxfds);
for (nfds= 0; nfds <= maxfds; ++nfds)
if ( FD_ISSET(nfds, &readfds) )
dprintf("%d ", nfds);
@@ -3251,7 +3251,6 @@ void iovDeleteFreeableStrings(struct filed *f)
for(i = 0 ; i < f->f_iIovUsed ; ++i) {
/* free to-be-freed strings in iovec */
if(*(f->f_bMustBeFreed + i)) {
- dprintf("DELETE freeable string '%s'\n", (char*)(f->f_iov + i)->iov_base);
free((f->f_iov + i)->iov_base);
*(f->f_bMustBeFreed) = 0;
}
@@ -3543,6 +3542,7 @@ void fprintlog(f, flags)
case F_TTY:
case F_FILE:
case F_PIPE:
+ dprintf("\n");
/* TODO: check if we need f->f_time = now;*/
/* f->f_file == -1 is an indicator that the we couldn't
open the file at startup. */
@@ -3561,7 +3561,6 @@ void fprintlog(f, flags)
case F_MYSQL:
f->f_time = now;
dprintf("\n");
- dprintf("Line: '%s'\n", msg);
writeMySQL(f);
break;
#endif
diff --git a/version.h b/version.h
index 46772ec0..85845929 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
#define VERSION "0.8"
-#define PATCHLEVEL "2"
+#define PATCHLEVEL "4"