- minor improvements and bug fixes

2010-09-02 11:43:46 +00:00
parent b74bcafc7a
commit 7644fe66e2
3 changed files with 11 additions and 4 deletions
--- a/sicscron.c
+++ b/sicscron.c
@ -74,8 +74,15 @@ static int CronTask(void *pData)
    StatisticsEnd(old);
    MacroPop();
    if (iRet != TCL_OK) {
+      if (strcmp(pTcl->result, "stop") == 0) {
+        SCPrintf(self->pCon, eLogError, "sicscron script '%s' stopped",
+                 self->pCommand);
+        self->iEnd = 0;
+        return 0;
+      }
      SCPrintf(self->pCon, eLogError,
-               "ERROR in sicscron script: %s", pTcl->result);
+               "ERROR in sicscron script '%s':", self->pCommand);
+      SCPrintf(self->pCon, eLogError, "ERROR: %s", pTcl->result);
    }
    if (self->iEnd == 2) {      /* dolater command */
      self->iEnd = 0;