files: only call loggers is there is work to do

pull/7957/head
Victor Julien 4 years ago
parent fa6d41ca66
commit 839a4f5ab4

@ -189,10 +189,10 @@ static inline void OutputTxLogFiles(ThreadVars *tv, OutputFileLoggerThreadData *
const bool file_trunc = StreamTcpReassembleDepthReached(p) | eof; const bool file_trunc = StreamTcpReassembleDepthReached(p) | eof;
SCLogDebug("tx: calling files: ffc %p head %p file_close %d file_trunc %d", ffc, ffc->head, SCLogDebug("tx: calling files: ffc %p head %p file_close %d file_trunc %d", ffc, ffc->head,
file_close, file_trunc); file_close, file_trunc);
if (filedata_td) if (filedata_td && txd->files_opened > txd->files_stored)
OutputFiledataLogFfc(tv, filedata_td, p, ffc, tx, tx_id, txd, packet_dir, file_close, OutputFiledataLogFfc(tv, filedata_td, p, ffc, tx, tx_id, txd, packet_dir, file_close,
file_trunc, packet_dir); file_trunc, packet_dir);
if (file_td) if (file_td && txd->files_opened > txd->files_logged)
OutputFileLogFfc( OutputFileLogFfc(
tv, file_td, p, ffc, tx, tx_id, txd, file_close, file_trunc, packet_dir); tv, file_td, p, ffc, tx, tx_id, txd, file_close, file_trunc, packet_dir);
} }
@ -203,10 +203,10 @@ static inline void OutputTxLogFiles(ThreadVars *tv, OutputFileLoggerThreadData *
opposing_finished = true; opposing_finished = true;
SCLogDebug("tx: calling for opposing direction files: file_close:%s file_trunc:%s", SCLogDebug("tx: calling for opposing direction files: file_close:%s file_trunc:%s",
file_close ? "true" : "false", file_trunc ? "true" : "false"); file_close ? "true" : "false", file_trunc ? "true" : "false");
if (filedata_td) if (filedata_td && txd->files_opened > txd->files_stored)
OutputFiledataLogFfc(tv, filedata_td, p, ffc_opposing, tx, tx_id, txd, opposing_dir, OutputFiledataLogFfc(tv, filedata_td, p, ffc_opposing, tx, tx_id, txd, opposing_dir,
file_close, file_trunc, opposing_dir); file_close, file_trunc, opposing_dir);
if (file_td) if (file_td && txd->files_opened > txd->files_logged)
OutputFileLogFfc(tv, file_td, p, ffc_opposing, tx, tx_id, txd, file_close, file_trunc, OutputFileLogFfc(tv, file_td, p, ffc_opposing, tx, tx_id, txd, file_close, file_trunc,
opposing_dir); opposing_dir);
} }

Loading…
Cancel
Save