config_skeleton 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dadb672b628b814c3962711ce001733dacda07fa75c1b9b418f389719af745b1
-  data.tar.gz: 32f6f9d54602208c9a8c7402b1e6a12d8f9e2045307b929537d69f09c56adda7
+  metadata.gz: 49838a344a63bcd0b3f308dbdc58f4d8a7426733e95c09feb72e5c8fb9fd4a99
+  data.tar.gz: 89b2e5c74c73131522ca2a062ed66c1d74fe4f74acfa41b3af6e5b5daa0ef6dc
 SHA512:
-  metadata.gz: 0cc9b1b46bbdeaa6c07850cad5dbe60b05d7bfadaf8cfa9d963a794e1320051463c74c94cef78822b7bd115567fed8622b1370068fdba079e3926cebd70b3dba
-  data.tar.gz: 64fc6ba379d78027b99f575eaa256b305e5dac656e9504d35b697d07c0d3fb5ac89793668d62046f1e500f8c59e3f4cdf47052a4ac62717f856206dd06a9f183
+  metadata.gz: d16025a92349c9e413754ff60afbe8e9147a4806ddd73cbe9f8425f2c781bde749b492de996c0eb919836ac6fc6c4e133a82de5c082929a22cb5405d2dccf9a4
+  data.tar.gz: a97c7c2713196ffd8720c5734f8b08a850410811e2afc957f098c56e5156040cf091a173c2bc868a4f7be452307887dbbf7f84533aed1975cb77810423285a6a

data/.github/workflows/ci.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
   push:
     branches:
-      - master
       - main
 
 jobs:
@@ -35,7 +34,7 @@ jobs:
         run: bundle exec rake test
 
   publish:
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     needs: build
     runs-on: ubuntu-latest
 
@@ -43,7 +42,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Release Gem
-        uses: discourse/publish-rubygems-action@v2-beta
+        uses: discourse/publish-rubygems-action@v3
         env:
           RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
           GIT_EMAIL: team@discourse.org

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.1"
 
   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
@@ -337,7 +339,7 @@ class ConfigSkeleton
   # @return [void]
   #
   def write_initial_config
-    if File.exists?(config_file)
+    if File.exist?(config_file)
       logger.info(logloc) { "Triggering a config regen on startup to ensure config is up-to-date" }
       regenerate_config
     else
@@ -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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: config_skeleton
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Matt Palmer
 - Discourse Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -179,7 +179,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - matt.palmer@discourse.org
 - team@discourse.org
@@ -201,7 +201,7 @@ files:
 homepage: https://github.com/discourse/config_skeleton
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,8 +216,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Dynamically generate configs and reload servers
 test_files: []