diff --git a/userspace/falco/CMakeLists.txt b/userspace/falco/CMakeLists.txt index 043581e0..b0f188cf 100644 --- a/userspace/falco/CMakeLists.txt +++ b/userspace/falco/CMakeLists.txt @@ -53,9 +53,7 @@ set( logger.cpp falco_outputs.cpp outputs_file.cpp - outputs_program.cpp outputs_stdout.cpp - outputs_syslog.cpp event_drops.cpp stats_writer.cpp versions_info.cpp @@ -90,6 +88,14 @@ if(USE_BUNDLED_DEPS) list(APPEND FALCO_DEPENDENCIES yamlcpp) endif() +if(NOT WIN32) + list( + APPEND FALCO_SOURCES + outputs_program.cpp + outputs_syslog.cpp +) +endif() + if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT MINIMAL_BUILD) list( APPEND FALCO_SOURCES diff --git a/userspace/falco/falco_outputs.cpp b/userspace/falco/falco_outputs.cpp index cc8deed1..652bd135 100644 --- a/userspace/falco/falco_outputs.cpp +++ b/userspace/falco/falco_outputs.cpp @@ -27,9 +27,11 @@ limitations under the License. #include "watchdog.h" #include "outputs_file.h" -#include "outputs_program.h" #include "outputs_stdout.h" +#if !defined(_WIN32) +#include "outputs_program.h" #include "outputs_syslog.h" +#endif #if !defined(_WIN32) && !defined(__EMSCRIPTEN__) && !defined(MINIMAL_BUILD) #include "outputs_http.h" #include "outputs_grpc.h" @@ -100,10 +102,12 @@ void falco_outputs::add_output(falco::outputs::config oc) { oo = new falco::outputs::output_stdout(); } +#ifndef _WIN32 else if(oc.name == "syslog") { oo = new falco::outputs::output_syslog(); } +#endif #if !defined(_WIN32) && !defined(__EMSCRIPTEN__) && !defined(MINIMAL_BUILD) else if(oc.name == "http") { diff --git a/userspace/falco/outputs_program.cpp b/userspace/falco/outputs_program.cpp index fa32dafb..e87bac11 100644 --- a/userspace/falco/outputs_program.cpp +++ b/userspace/falco/outputs_program.cpp @@ -20,7 +20,6 @@ limitations under the License. void falco::outputs::output_program::open_pfile() { -#ifndef _WIN32 if(m_pfile == nullptr) { m_pfile = popen(m_oc.options["program"].c_str(), "w"); @@ -30,7 +29,6 @@ void falco::outputs::output_program::open_pfile() setvbuf(m_pfile, NULL, _IONBF, 0); } } -#endif } void falco::outputs::output_program::output(const message *msg) @@ -47,13 +45,11 @@ void falco::outputs::output_program::output(const message *msg) void falco::outputs::output_program::cleanup() { -#ifndef _WIN32 if(m_pfile != nullptr) { pclose(m_pfile); m_pfile = nullptr; } -#endif } void falco::outputs::output_program::reopen() diff --git a/userspace/falco/outputs_syslog.cpp b/userspace/falco/outputs_syslog.cpp index 405272d8..3637b2f9 100644 --- a/userspace/falco/outputs_syslog.cpp +++ b/userspace/falco/outputs_syslog.cpp @@ -16,14 +16,10 @@ limitations under the License. */ #include "outputs_syslog.h" -#ifndef _WIN32 #include -#endif void falco::outputs::output_syslog::output(const message *msg) { -#ifndef _WIN32 // Syslog output should not have any trailing newline ::syslog(msg->priority, "%s", msg->msg.c_str()); -#endif }