diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | plugins/omrelp/omrelp.c | 1 | ||||
| -rw-r--r-- | runtime/nsdsel_gtls.c | 2 | ||||
| -rw-r--r-- | runtime/vm.c | 3 | ||||
| -rw-r--r-- | tools/syslogd.c | 6 |
5 files changed, 1 insertions, 12 deletions
@@ -2,6 +2,7 @@ Version 3.19.10 (rgerhards), 2008-07-?? - bugfix: bad memory leak in disk-based queue modes - important queue bugfix from 3.18.1 imported (see below) +- cleanup of some debug messages --------------------------------------------------------------------------- Version 3.19.9 (rgerhards), 2008-07-07 - added tutorial for creating a TLS-secured syslog infrastructure diff --git a/plugins/omrelp/omrelp.c b/plugins/omrelp/omrelp.c index 41c72879..71d6e797 100644 --- a/plugins/omrelp/omrelp.c +++ b/plugins/omrelp/omrelp.c @@ -164,7 +164,6 @@ CODESTARTdoAction /* forward */ ret = relpCltSendSyslog(pData->pRelpClt, (uchar*) pMsg, lenMsg); -RUNLOG_VAR("%d", ret); if(ret != RELP_RET_OK) { /* error! */ dbgprintf("error forwarding via relp, suspending\n"); diff --git a/runtime/nsdsel_gtls.c b/runtime/nsdsel_gtls.c index 81b90a62..c3a93bee 100644 --- a/runtime/nsdsel_gtls.c +++ b/runtime/nsdsel_gtls.c @@ -91,7 +91,6 @@ Add(nsdsel_t *pNsdsel, nsd_t *pNsd, nsdsel_waitOp_t waitOp) /* if we reach this point, we need no special handling */ CHKiRet(nsdsel_ptcp.Add(pThis->pTcp, pNsdGTLS->pTcp, waitOp)); -RUNLOG_VAR("%d", pThis->iBufferRcvReady); finalize_it: RETiRet; } @@ -107,7 +106,6 @@ Select(nsdsel_t *pNsdsel, int *piNumReady) nsdsel_gtls_t *pThis = (nsdsel_gtls_t*) pNsdsel; ISOBJ_TYPE_assert(pThis, nsdsel_gtls); -RUNLOG_VAR("%d", pThis->iBufferRcvReady); if(pThis->iBufferRcvReady > 0) { /* we still have data ready! */ *piNumReady = pThis->iBufferRcvReady; diff --git a/runtime/vm.c b/runtime/vm.c index bcd331ec..bc6c3dd2 100644 --- a/runtime/vm.c +++ b/runtime/vm.c @@ -198,7 +198,6 @@ CODESTARTop(CMP_CONTAINS) bRes = (rsCStrLocateInSzStr(operand2->val.pStr, rsCStrGetSzStr(operand1->val.pStr)) == -1) ? 0 : 1; /* we have a result, so let's push it */ -RUNLOG_VAR("%lld", bRes); \ PUSHRESULTop(operand1, bRes); var.Destruct(&operand2); /* no longer needed */ ENDop(CMP_CONTAINS) @@ -218,7 +217,6 @@ var.DebugPrint(operand2); \ bRes = (rsCStrCaseInsensitiveLocateInSzStr(operand2->val.pStr, rsCStrGetSzStr(operand1->val.pStr)) == -1) ? 0 : 1; /* we have a result, so let's push it */ -RUNLOG_VAR("%lld", bRes); \ PUSHRESULTop(operand1, bRes); var.Destruct(&operand2); /* no longer needed */ ENDop(CMP_CONTAINSI) @@ -237,7 +235,6 @@ CODESTARTop(CMP_STARTSWITH) rsCStrLen(operand2->val.pStr)) == 0) ? 1 : 0; /* we have a result, so let's push it */ -RUNLOG_VAR("%lld", bRes); \ PUSHRESULTop(operand1, bRes); var.Destruct(&operand2); /* no longer needed */ ENDop(CMP_STARTSWITH) diff --git a/tools/syslogd.c b/tools/syslogd.c index b005b6d0..3f97a70f 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -908,8 +908,6 @@ logmsgInternal(int iErr, int pri, uchar *msg, int flags) datetime.getCurrTime(&(pMsg->tTIMESTAMP)); /* use the current time! */ flags |= INTERNAL_MSG; -RUNLOG_VAR("%d", bHaveMainQueue); -RUNLOG_VAR("%p", pMsg); if(bHaveMainQueue == 0) { /* not yet in queued mode */ iminternalAddMsg(pri, pMsg, flags); } else { @@ -1628,14 +1626,10 @@ logmsg(msg_t *pMsg, int flags) /* ---------------------- END PARSING ---------------- */ -RUNLOG; /* now submit the message to the main queue - then we are done */ pMsg->msgFlags = flags; -RUNLOG; MsgPrepareEnqueue(pMsg); -RUNLOG; queueEnqObj(pMsgQueue, pMsg->flowCtlType, (void*) pMsg); -RUNLOG; ENDfunc } |