diff --git a/modules/affile/CMakeLists.txt b/modules/affile/CMakeLists.txt index fd355f2ce7..d235c48669 100644 --- a/modules/affile/CMakeLists.txt +++ b/modules/affile/CMakeLists.txt @@ -1,6 +1,5 @@ set(AFFILE_SOURCES "affile-dest.h" - "affile-dest-internal-queue-filter.h" "affile-parser.h" "affile-source.h" "collection-comparator.h" diff --git a/modules/affile/Makefile.am b/modules/affile/Makefile.am index 47a0d6d777..3f4827d575 100644 --- a/modules/affile/Makefile.am +++ b/modules/affile/Makefile.am @@ -44,8 +44,7 @@ modules_affile_libaffile_la_SOURCES = \ modules/affile/affile-parser.h \ modules/affile/affile-plugin.c \ modules/affile/file-list.h \ - modules/affile/file-list.c \ - modules/affile/affile-dest-internal-queue-filter.h + modules/affile/file-list.c if HAVE_INOTIFY modules_affile_libaffile_la_SOURCES += \ diff --git a/modules/affile/affile-dest-internal-queue-filter.h b/modules/affile/affile-dest-internal-queue-filter.h deleted file mode 100644 index 74dc62612b..0000000000 --- a/modules/affile/affile-dest-internal-queue-filter.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2002-2017 Balabit - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * As an additional exemption you are allowed to compile & link against the - * OpenSSL libraries as published by the OpenSSL project. See the file - * COPYING for details. - * - */ - -#ifndef AFFILE_DEST_INTERNAL_QUEUE_FILTER_H_INCLUDED -#define AFFILE_DEST_INTERNAL_QUEUE_FILTER_H_INCLUDED - -#include "syslog-ng.h" - -static inline gboolean -affile_dw_queue_enabled_for_msg(LogMessage *msg) -{ - return TRUE; -} - -#endif - diff --git a/modules/affile/affile-dest.c b/modules/affile/affile-dest.c index 4999b88213..5a3672890e 100644 --- a/modules/affile/affile-dest.c +++ b/modules/affile/affile-dest.c @@ -33,7 +33,6 @@ #include "transport/transport-file.h" #include "transport/transport-pipe.h" #include "logwriter.h" -#include "affile-dest-internal-queue-filter.h" #include "file-specializations.h" #include "apphook.h" #include "timeutils/cache.h" @@ -282,12 +281,6 @@ affile_dw_deinit(LogPipe *s) static void affile_dw_queue(LogPipe *s, LogMessage *lm, const LogPathOptions *path_options) { - if (!affile_dw_queue_enabled_for_msg(lm)) - { - log_msg_drop(lm, path_options, AT_PROCESSED); - return; - } - AFFileDestWriter *self = (AFFileDestWriter *) s; g_mutex_lock(&self->lock);