config_skeleton 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dadb672b628b814c3962711ce001733dacda07fa75c1b9b418f389719af745b1
-  data.tar.gz: 32f6f9d54602208c9a8c7402b1e6a12d8f9e2045307b929537d69f09c56adda7
+  metadata.gz: f85f27d60f4dcaf253af5ecff4d6fcc6d851e5b54ad85d3f8cdf2bae4ac4a541
+  data.tar.gz: fa4ca080415307e4d44e19f12fc5799fc3b8b8f750eda72c7d543491cd37e7fb
 SHA512:
-  metadata.gz: 0cc9b1b46bbdeaa6c07850cad5dbe60b05d7bfadaf8cfa9d963a794e1320051463c74c94cef78822b7bd115567fed8622b1370068fdba079e3926cebd70b3dba
-  data.tar.gz: 64fc6ba379d78027b99f575eaa256b305e5dac656e9504d35b697d07c0d3fb5ac89793668d62046f1e500f8c59e3f4cdf47052a4ac62717f856206dd06a9f183
+  metadata.gz: bc6ad4e7c89e473d0902c44b160040da924943d3437310a2edb202a3bab246259f238691bbb81696cc7cf0f0bbe635444dab8add65d0d56790907014aa973293
+  data.tar.gz: 9659f0fd04bf6d2e89bc2d58ecc82dd741dd6b1f266d7ff36e621fcb0e5c3774e524c7b02187d90c699d7d2163412505bf55501e35c679d25f1f1f2dd590e755

data/config_skeleton.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "config_skeleton"
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.platform = Gem::Platform::RUBY
   s.summary  = "Dynamically generate configs and reload servers"

data/lib/config_skeleton.rb

@@ -164,11 +164,12 @@ class ConfigSkeleton
   end
 
   def self.inherited(klass)
+    klass.gauge :"#{klass.service_name}_config_ok", docstring: "Whether the last config change was accepted by the server"
+    klass.gauge :"#{klass.service_name}_generation_ok", docstring: "Whether the last config generation completed without error"
     klass.gauge :"#{klass.service_name}_last_generation_timestamp", docstring: "When the last config generation run was made"
     klass.gauge :"#{klass.service_name}_last_change_timestamp", docstring: "When the config file was last written to"
     klass.counter :"#{klass.service_name}_reload_total", docstring: "How many times we've asked the server to reload", labels: [:status]
     klass.counter :"#{klass.service_name}_signals_total", docstring: "How many signals have been received (and handled)"
-    klass.gauge :"#{klass.service_name}_config_ok", docstring: "Whether the last config change was accepted by the server"
 
     klass.hook_signal("HUP") do
       logger.info("SIGHUP") { "received SIGHUP, triggering config regeneration" }
@@ -329,6 +330,7 @@ class ConfigSkeleton
     metrics.last_generation_timestamp.set(0)
     metrics.last_change_timestamp.set(0)
     metrics.config_ok.set(0)
+    metrics.generation_ok.set(0)
   end
 
   # Write out a config file if one doesn't exist, or do an initial regen run
@@ -431,9 +433,15 @@ class ConfigSkeleton
   #
   def instrumented_config_data
     begin
-      @config_generation.measure { config_data.tap { metrics.last_generation_timestamp.set(Time.now.to_f) } }
+      @config_generation.measure do
+        config_data.tap do
+          metrics.last_generation_timestamp.set(Time.now.to_f)
+          metrics.generation_ok.set(1)
+        end
+      end
     rescue => ex
       log_exception(ex, logloc) { "Call to config_data raised exception" }
+      metrics.generation_ok.set(0)
       nil
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config_skeleton
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Matt Palmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2022-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Dynamically generate configs and reload servers