Live rule swap logs added to report SigLoadSignatures() failure. Also set

thread_closed flag on exit for live swap thread.
pull/326/merge
Anoop Saldanha 13 years ago committed by Victor Julien
parent a3212f6a0f
commit 8bf034e8c4

@ -421,6 +421,13 @@ static void *DetectEngineLiveRuleSwap(void *arg)
SCLogError(SC_ERR_NO_RULES_LOADED, "Loading signatures failed.");
if (de_ctx->failure_fatal)
exit(EXIT_FAILURE);
DetectEngineCtxFree(de_ctx);
SCLogError(SC_ERR_LIVE_RULE_SWAP, "Failure encountered while "
"loading new ruleset with live swap.");
SCLogInfo("===== Live rule swap DONE =====");
TmThreadsSetFlag(tv_local, THV_CLOSED);
pthread_exit(NULL);
return NULL;
}
SCThresholdConfInitContext(de_ctx, NULL);

@ -245,6 +245,7 @@ const char * SCErrorToString(SCError err)
CASE_CODE (SC_ERR_DEFRAG_INIT);
CASE_CODE (SC_ERR_NO_REPUTATION);
CASE_CODE (SC_ERR_NOT_SUPPORTED);
CASE_CODE (SC_ERR_LIVE_RULE_SWAP);
default:
return "UNKNOWN_ERROR";
}

@ -258,6 +258,7 @@ typedef enum {
SC_ERR_IPFW_SETSOCKOPT,
SC_ERR_NO_GEOIP_SUPPORT,
SC_ERR_GEOIP_ERROR,
SC_ERR_LIVE_RULE_SWAP,
} SCError;
const char *SCErrorToString(SCError);

Loading…
Cancel
Save