Add CivetCallbacks to Exposer ctor, closes jupp0r#479

Signed-off-by: kuvaldini <ivan@kuvaldini.pro>
kuvaldini · Apr 20, 2021 · 2865044 · 2865044
1 parent a1c9b1d
commit 2865044
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/pull/include/prometheus/exposer.h b/pull/include/prometheus/exposer.h
@@ -10,6 +10,7 @@
 #include "prometheus/detail/pull_export.h"
 
 class CivetServer;
+class CivetCallbacks;
 
 namespace prometheus {
 
@@ -20,8 +21,9 @@ class Endpoint;
 class PROMETHEUS_CPP_PULL_EXPORT Exposer {
  public:
   explicit Exposer(const std::string& bind_address,
-                   const std::size_t num_threads = 2);
-  explicit Exposer(std::vector<std::string> options);
+                   const std::size_t num_threads = 2, 
+                   const CivetCallbacks *callbacks = nullptr);
+  explicit Exposer(std::vector<std::string> options, const CivetCallbacks *callbacks = nullptr);
   ~Exposer();
   void RegisterCollectable(const std::weak_ptr<Collectable>& collectable,
                            const std::string& uri = std::string("/metrics"));

diff --git a/pull/src/exposer.cc b/pull/src/exposer.cc
@@ -11,13 +11,18 @@
 
 namespace prometheus {
 
-Exposer::Exposer(const std::string& bind_address, const std::size_t num_threads)
+Exposer::Exposer(const std::string& bind_address, 
+                 const std::size_t num_threads, 
+                 const CivetCallbacks *callbacks)
     : Exposer(std::vector<std::string>{"listening_ports", bind_address,
                                        "num_threads",
-                                       std::to_string(num_threads)}) {}
+                                       std::to_string(num_threads)},
+              callbacks) {}
 
-Exposer::Exposer(std::vector<std::string> options)
-    : server_(detail::make_unique<CivetServer>(std::move(options))) {}
+Exposer::Exposer(std::vector<std::string> options, 
+                 const CivetCallbacks *callbacks)
+    : server_(detail::make_unique<CivetServer>(std::move(options),
+                                               callbacks)) {}
 
 Exposer::~Exposer() = default;