recipes/rsyslog/files/rsyslog-resume.patch

   1 From 467f10a13950b4b8d5a9fff7f14c20874777a4ba Mon Sep 17 00:00:00 2001
   2 From: Steffen Sledz <sledz@dresearch.de>
   3 Date: Fri, 30 Jul 2010 14:39:53 +0200
   4 Subject: [PATCH] break potential infinite loop in actionDoRetry
   5
   6 If a module always returns RS_RET_OK (like ompipe does) the actionDoRetry
   7 loop may not have leaved faked ACT_STATE_SUSP state in case iResumeOKinRow
   8 had ever reached a count of 1000.
   9
  10 Signed-off-by: Steffen Sledz <sledz@dresearch.de>
  11 ---
  12  action.c |    1 +
  13  1 files changed, 1 insertions(+), 0 deletions(-)
  14
  15 diff --git a/action.c b/action.c
  16 index 32a07dc..90ec1bf 100644
  17 --- a/action.c
  18 +++ b/action.c
  19 @@ -508,6 +508,7 @@ static rsRetVal actionDoRetry(action_t *pThis, time_t ttNow)
  20                 iRet = pThis->pMod->tryResume(pThis->pModData);
  21                 if((pThis->iResumeOKinRow > 999) && (pThis->iResumeOKinRow % 1000 == 0)) {
  22                         bTreatOKasSusp = 1;
  23 +                       pThis->iResumeOKinRow = 0;
  24                 } else {
  25                         bTreatOKasSusp = 0;
  26                 }
  27 --
  28 1.6.4.2
  29