alert-json: fix cleanup

Call specialized clean up function when running as a sub-module.
pull/926/head
Victor Julien 11 years ago
parent f62185c207
commit 1f2310bb34

@ -260,11 +260,18 @@ static TmEcode JsonAlertLogThreadDeinit(ThreadVars *t, void *data)
static void JsonAlertLogDeInitCtx(OutputCtx *output_ctx) static void JsonAlertLogDeInitCtx(OutputCtx *output_ctx)
{ {
SCLogDebug("cleaning up output_ctx");
LogFileCtx *logfile_ctx = (LogFileCtx *)output_ctx->data; LogFileCtx *logfile_ctx = (LogFileCtx *)output_ctx->data;
LogFileFreeCtx(logfile_ctx); LogFileFreeCtx(logfile_ctx);
SCFree(output_ctx); SCFree(output_ctx);
} }
static void JsonAlertLogDeInitCtxSub(OutputCtx *output_ctx)
{
SCLogDebug("cleaning up sub output_ctx %p", output_ctx);
SCFree(output_ctx);
}
#define DEFAULT_LOG_FILENAME "alert.json" #define DEFAULT_LOG_FILENAME "alert.json"
/** /**
* \brief Create a new LogFileCtx for "fast" output style. * \brief Create a new LogFileCtx for "fast" output style.
@ -307,7 +314,7 @@ static OutputCtx *JsonAlertLogInitCtxSub(ConfNode *conf, OutputCtx *parent_ctx)
return NULL; return NULL;
output_ctx->data = ajt->file_ctx; output_ctx->data = ajt->file_ctx;
output_ctx->DeInit = JsonAlertLogDeInitCtx; output_ctx->DeInit = JsonAlertLogDeInitCtxSub;
return output_ctx; return output_ctx;
} }

Loading…
Cancel
Save