filestore: remove jansson ifdefs

Jansson is now required.
pull/3830/head
Jason Ish 8 years ago committed by Victor Julien
parent 3dc973d4b1
commit 9d8eb7b5f0

@ -158,7 +158,6 @@ static void OutputFilestoreFinalizeFiles(ThreadVars *tv,
return;
}
#ifdef HAVE_LIBJANSSON
if (ctx->fileinfo) {
char js_metadata_filename[PATH_MAX];
if (snprintf(js_metadata_filename, sizeof(js_metadata_filename),
@ -176,7 +175,6 @@ static void OutputFilestoreFinalizeFiles(ThreadVars *tv,
}
}
}
#endif
}
static int OutputFilestoreLogger(ThreadVars *tv, void *thread_data,
@ -451,13 +449,8 @@ static OutputInitResult OutputFilestoreLogInitCtx(ConfNode *conf)
const char *write_fileinfo = ConfNodeLookupChildValue(conf,
"write-fileinfo");
if (write_fileinfo != NULL && ConfValIsTrue(write_fileinfo)) {
#ifdef HAVE_LIBJANSSON
SCLogConfig("Filestore (v2) will output fileinfo records.");
ctx->fileinfo = true;
#else
SCLogWarning(SC_ERR_NO_JSON_SUPPORT,
"Filestore (v2) requires JSON support to log fileinfo records");
#endif
}
const char *force_filestore = ConfNodeLookupChildValue(conf,

Loading…
Cancel
Save