Merge pull request #456 from bshifter/fx-pubsub

filterx pubsub message
axoflow · Jan 21, 2025 · 7a1ef06 · 7a1ef06
2 parents e814ffb + 2a3dfc9
commit 7a1ef06
Show file tree

Hide file tree

Showing 16 changed files with 660 additions and 13 deletions.
diff --git a/modules/grpc/pubsub/CMakeLists.txt b/modules/grpc/pubsub/CMakeLists.txt
@@ -21,7 +21,7 @@ add_module(
   TARGET pubsub-cpp
   SOURCES ${PUBSUB_CPP_SOURCES}
   DEPENDS ${MODULE_GRPC_LIBS} grpc-protos grpc-common-cpp
-  INCLUDES ${PUBSUB_PROTO_BUILDDIR} ${PROJECT_SOURCE_DIR}/modules/grpc
+  INCLUDES ${GOOGLEAPIS_PROTO_GRPC_SOURCES} ${PROJECT_SOURCE_DIR}/modules/grpc
   LIBRARY_TYPE STATIC
 )
 
@@ -35,3 +35,6 @@ add_module(
 )
 
 set_target_properties(pubsub PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/lib/syslog-ng")
+
+add_subdirectory(filterx)
+target_link_libraries(pubsub PRIVATE pubsub_filterx_message_cpp)
diff --git a/modules/grpc/pubsub/Makefile.am b/modules/grpc/pubsub/Makefile.am
@@ -42,7 +42,8 @@ modules_grpc_pubsub_libpubsub_la_LIBADD = \
   $(MODULE_DEPS_LIBS) \
   $(GRPC_COMMON_LIBS) \
   $(top_builddir)/modules/grpc/protos/libgrpc-protos.la \
-  $(top_builddir)/modules/grpc/pubsub/libpubsub_cpp.la
+  $(top_builddir)/modules/grpc/pubsub/libpubsub_cpp.la \
+  $(top_builddir)/modules/grpc/pubsub/filterx/libfilterx.la
 
 nodist_EXTRA_modules_grpc_pubsub_libpubsub_la_SOURCES = force-cpp-linker-with-default-stdlib.cpp
 
@@ -51,7 +52,8 @@ EXTRA_modules_grpc_pubsub_libpubsub_la_DEPENDENCIES = \
   $(MODULE_DEPS_LIBS) \
   $(GRPC_COMMON_LIBS) \
   $(top_builddir)/modules/grpc/protos/libgrpc-protos.la \
-  $(top_builddir)/modules/grpc/pubsub/libpubsub_cpp.la
+  $(top_builddir)/modules/grpc/pubsub/libpubsub_cpp.la \
+  $(top_builddir)/modules/grpc/pubsub/filterx/libfilterx.la
 
 modules/grpc/pubsub modules/grpc/pubsub/ mod-pubsub: modules/grpc/pubsub/libpubsub.la
 
@@ -71,3 +73,5 @@ EXTRA_DIST += \
   modules/grpc/pubsub/CMakeLists.txt
 
 .PHONY: modules/grpc/pubsub/ mod-pubsub
+
+include modules/grpc/pubsub/filterx/Makefile.am
diff --git a/modules/grpc/pubsub/filterx/CMakeLists.txt b/modules/grpc/pubsub/filterx/CMakeLists.txt
@@ -0,0 +1,21 @@
+if(NOT ENABLE_CPP)
+  return()
+endif()
+
+# C++ code
+
+set(PUBSUB_CPP_SOURCES
+  object-pubsub.h
+  object-pubsub-message.cpp
+  object-pubsub-message.hpp
+)
+
+add_module(
+  TARGET pubsub_filterx_message_cpp
+  SOURCES ${PUBSUB_CPP_SOURCES}
+  DEPENDS ${MODULE_GRPC_LIBS} grpc-protos
+  INCLUDES ${GOOGLEAPIS_PROTO_GRPC_SOURCES} ${PROJECT_SOURCE_DIR}/modules/grpc
+  LIBRARY_TYPE STATIC
+)
+
+set_target_properties(pubsub_filterx_message_cpp PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
diff --git a/modules/grpc/pubsub/filterx/Makefile.am b/modules/grpc/pubsub/filterx/Makefile.am
@@ -0,0 +1,34 @@
+if ENABLE_GRPC
+
+# noinst: Built as part of a larger libpubsub module as static library
+noinst_LTLIBRARIES += modules/grpc/pubsub/filterx/libfilterx.la
+
+modules_grpc_pubsub_filterx_libfilterx_la_SOURCES = \
+  modules/grpc/pubsub/filterx/object-pubsub.h \
+  modules/grpc/pubsub/filterx/object-pubsub-message.cpp \
+  modules/grpc/pubsub/filterx/object-pubsub-message.hpp
+
+modules_grpc_pubsub_filterx_libfilterx_la_CXXFLAGS = \
+  $(AM_CXXFLAGS) \
+  $(PROTOBUF_CFLAGS) \
+  $(GRPCPP_CFLAGS) \
+  -I$(GOOGLEAPIS_PROTO_BUILDDIR) \
+  -I$(top_srcdir)/modules/grpc/pubsub/filterx \
+  -I$(top_builddir)/modules/grpc/pubsub/filterx \
+  -Wno-deprecated-declarations
+
+modules_grpc_pubsub_filterx_libfilterx_la_LIBADD = \
+  $(MODULE_DEPS_LIBS) \
+  $(PROTOBUF_LIBS) \
+  $(top_builddir)/modules/grpc/protos/libgrpc-protos.la
+
+modules_grpc_pubsub_filterx_libfilterx_la_LDFLAGS = $(MODULE_LDFLAGS)
+
+EXTRA_modules_grpc_pubsub_filterx_libfilterx_la_DEPENDENCIES = \
+  $(MODULE_DEPS_LIBS) \
+  $(top_builddir)/modules/grpc/protos/libgrpc-protos.la
+
+endif
+
+EXTRA_DIST += \
+  modules/grpc/pubsub/filterx/CMakeLists.txt