in_systemd: validate if FLB_SQLDB is set

Signed-off-by: Eduardo Silva <[email protected]>

Author: edsiper

plugins/in_systemd/CMakeLists.txt

@@ -1,6 +1,11 @@
 set(src
   systemd_config.c
-  systemd_db.c
   systemd.c)
 
+if(FLB_SQLDB)
+set(src
+    ${src}
+    systemd_db.c)
+endif()
+
 FLB_PLUGIN(in_systemd "${src}" ${JOURNALD_LIBRARIES})

plugins/in_systemd/systemd.c

@@ -86,7 +86,9 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
     const char *key;
     const char *val;
     char *tmp;
+#ifdef FLB_HAVE_SQLDB
     char *cursor = NULL;
+#endif
     char *tag;
     char new_tag[PATH_MAX];
     char last_tag[PATH_MAX];
@@ -260,6 +262,7 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
         }
     }
 
+#ifdef FLB_HAVE_SQLDB
     /* Save cursor */
     if (ctx->db) {
         sd_journal_get_cursor(ctx->j, &cursor);
@@ -268,6 +271,7 @@ static int in_systemd_collect(struct flb_input_instance *i_ins,
             flb_free(cursor);
         }
     }
+#endif
 
     /* Write any pending data into the buffer */
     if (mp_sbuf.size > 0) {

plugins/in_systemd/systemd_config.c

@@ -28,7 +28,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#ifdef FLB_HAVE_SQLDB
 #include "systemd_db.h"
+#endif
+
 #include "systemd_config.h"
 
 struct flb_systemd_config *flb_systemd_config_create(struct flb_input_instance *i_ins,
@@ -107,6 +110,7 @@ struct flb_systemd_config *flb_systemd_config_create(struct flb_input_instance *
         ctx->dynamic_tag = FLB_FALSE;
     }
 
+#ifdef FLB_HAVE_SQLDB
     /* Database file */
     tmp = flb_input_get_property("db", i_ins);
     if (tmp) {
@@ -115,6 +119,7 @@ struct flb_systemd_config *flb_systemd_config_create(struct flb_input_instance *
             flb_error("[in_systemd] could not open/create database");
         }
     }
+#endif
 
     /* Max number of fields per record/entry */
     tmp = flb_input_get_property("max_fields", i_ins);
@@ -186,6 +191,7 @@ struct flb_systemd_config *flb_systemd_config_create(struct flb_input_instance *
         sd_journal_seek_head(ctx->j);
     }
 
+#ifdef FLB_HAVE_SQLDB
     /* Check if we have a cursor in our database */
     if (ctx->db) {
         cursor = flb_systemd_db_get_cursor(ctx);
@@ -203,6 +209,7 @@ struct flb_systemd_config *flb_systemd_config_create(struct flb_input_instance *
             flb_free(cursor);
         }
     }
+#endif
 
     tmp = flb_input_get_property("strip_underscores", i_ins);
     if (tmp != NULL && flb_utils_bool(tmp)) {
@@ -229,9 +236,11 @@ int flb_systemd_config_destroy(struct flb_systemd_config *ctx)
         flb_free(ctx->path);
     }
 
+#ifdef FLB_HAVE_SQLDB
     if (ctx->db) {
         flb_systemd_db_close(ctx->db);
     }
+#endif
 
     close(ctx->ch_manager[0]);
     close(ctx->ch_manager[1]);

plugins/in_systemd/systemd_config.h

@@ -59,7 +59,10 @@ struct flb_systemd_config {
     int max_fields;            /* max number of fields per record */
     int max_entries;           /* max number of records per iteration */
     int strip_underscores;
+
+#ifdef FLB_HAVE_SQLDB
     struct flb_sqldb *db;
+#endif
     struct flb_input_instance *i_ins;
 };