From cec6e62eb4fabfb81c79e5c6c7a51fe9207c23f6 Mon Sep 17 00:00:00 2001
From: Leif Hedstrom <zwoop@apache.org>
Date: Thu, 12 Oct 2023 13:03:20 -0600
Subject: [PATCH] Fixes some build issues around cripts

---
 include/cripts/Instance.hpp | 2 +-
 src/cripts/CMakeLists.txt   | 4 ++--
 src/cripts/Instance.cc      | 1 -
 src/cripts/Lulu.cc          | 4 +---
 src/cripts/Matcher.cc       | 1 -
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/cripts/Instance.hpp b/include/cripts/Instance.hpp
index 043518cf0a8..e11c4a9dc1a 100644
--- a/include/cripts/Instance.hpp
+++ b/include/cripts/Instance.hpp
@@ -80,7 +80,7 @@ class Instance
   [[nodiscard]] bool
   debugOn() const
   {
-    return (diags_on_for_plugins && TSIsDebugTagSet(plugin_debug_tag.c_str()));
+    return dbg_ctl_cript.on();
   }
 
   void
diff --git a/src/cripts/CMakeLists.txt b/src/cripts/CMakeLists.txt
index d3cf4c18b4c..38d99a97305 100644
--- a/src/cripts/CMakeLists.txt
+++ b/src/cripts/CMakeLists.txt
@@ -23,12 +23,12 @@ find_package(fmt 8.1 REQUIRED)
 pkg_check_modules(PCRE2 REQUIRED IMPORTED_TARGET libpcre2-8)
 
 # The source files, globbed so we can drop in local / custom Bundles and extensions.
-file(GLOB CPP_FILES ${PROJECT_SOURCE_DIR}/src/cripts/*.cc ${PROJECT_SOURCE_DIR}/src/cripts/Bundles/*.cc)
+file(GLOB CPP_FILES ${PROJECT_SOURCE_DIR}/src/cripts/*.cc ${PROJECT_SOURCE_DIR}/src/cripts/*/*.cc)
 
 add_library(cripts SHARED ${CPP_FILES})
 add_library(ts::cripts ALIAS cripts)
 
-target_link_libraries(cripts fmt::fmt PkgConfig::PCRE2)
+target_link_libraries(cripts libswoc fmt::fmt PkgConfig::PCRE2)
 target_include_directories(cripts PRIVATE
     ${PROJECT_SOURCE_DIR}
     ${PROJECT_SOURCE_DIR}/proxy
diff --git a/src/cripts/Instance.cc b/src/cripts/Instance.cc
index b4e08eb0d3d..aed923587e9 100644
--- a/src/cripts/Instance.cc
+++ b/src/cripts/Instance.cc
@@ -50,7 +50,6 @@ Cript::Instance::initialize(int argc, char *argv[], const char *filename)
   }
 
   dbg_ctl_cript.set(plugin_debug_tag.c_str());
-  TSDebug("Cript", "Switching instance debug tag to %s", plugin_debug_tag.c_str());
 }
 
 #include <iostream>
diff --git a/src/cripts/Lulu.cc b/src/cripts/Lulu.cc
index d9172ad9451..b83b41d6429 100644
--- a/src/cripts/Lulu.cc
+++ b/src/cripts/Lulu.cc
@@ -33,8 +33,6 @@ const Cript::string maxMindDBPath = CRIPTS_MAXMIND_DB;
 void
 global_initialization()
 {
-  TSDebug("Cript", "Initializing the Cript library, this should only happen once!");
-
   std::srand(std::time(nullptr) * getpid());
 
 #if CRIPTS_HAS_MAXMIND
@@ -42,7 +40,7 @@ global_initialization()
 
   int status = MMDB_open(maxMindDBPath.c_str(), MMDB_MODE_MMAP, gMaxMindDB);
   if (MMDB_SUCCESS != status) {
-    TSDebug("Cript", "Cannot open %s - %s", maxMindDBPath.c_str(), MMDB_strerror(status));
+    TSError("[Cripts] Cannot open %s - %s", maxMindDBPath.c_str(), MMDB_strerror(status));
     delete gMaxMindDB;
     gMaxMindDB = nullptr;
     return;
diff --git a/src/cripts/Matcher.cc b/src/cripts/Matcher.cc
index 1af63ffbc70..521d0b755f5 100644
--- a/src/cripts/Matcher.cc
+++ b/src/cripts/Matcher.cc
@@ -61,7 +61,6 @@ Matcher::PCRE::add(Cript::string_view regex, uint32_t options, bool jit)
         TSReleaseAssert(!"Failed to JIT compile regex");
       }
     }
-    TSDebug("Cripts", "Adding regex: %.*s", (int)regex.length(), regex.data());
     _regexes.push_back(Matcher::PCRE::Regex{regex, re});
   }
 }