usps-support 0.2.54 → 0.2.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25e1fba8f54fb60dbbfb9a732b97e778870360e9364793f360f843209c494637
-  data.tar.gz: 439cdf0bf9b9732ad9c3121937b5b4ea2f937b03bf08f12fc9715bb565a43857
+  metadata.gz: 62e9af5356bcd1225e25c991b17f12adfe1aba9966c46fab7c0c579369da84dd
+  data.tar.gz: 40296e55d69d18fdef651c805ff126d39e6ba00d9eabaf88dafddc2f8390f2a9
 SHA512:
-  metadata.gz: aad1a023c1b15d3576d07d55d80bc61f6b97c8d0c1f2f845476458e8f8f2bb2d5ef7ce15bea1187d98db900fae9fd7fdbca9e884f4b513f602c60f0a158ab909
-  data.tar.gz: c292fde711fece0d25b67b0616fcfe37a2a88dd65277693afb70d7f4ad795dea84d455b2e4257e00d796a86bfa478c9ea901c7dca9e17bcc8a4a33bed0a2dc12
+  metadata.gz: 33e56e8f63917e3fc353ff5f45d6517696e04e427def8bed96035f263a1e5530d666e6e97ad82930bf2716ab91d89bc76e99ae1c5cfb29ba695098e4617b58d8
+  data.tar.gz: 3c53c7c5d9e0a021b30b660d1663c1fa5b7722360f1ea89f04dbfbd6bd1cc09cadb30da31916b8ab9b629b76bc56c1ade9f8aeb2a5c8909c3a9b372a038e4d2a

data/app/controllers/usps/support/health_controller.rb

@@ -20,6 +20,11 @@ module Usps::Support
   # and route to it (`get 'health' => 'health#show'`). For a bespoke dependency, define a
   # #check_<name> in the subclass (e.g. wrapping #check_http(url)) and add <name> to CHECKS.
   #
+  # Responds 503 when any check fails, EXCEPT to callers that pass ?probe=1, which always get 200
+  # and are expected to judge health by the sentinel in the body. That exists so a failing
+  # dependency does not register as an application 5XX on the load balancer -- see #response_status.
+  # Point external string-matching probes at /health?probe=1; leave it off everywhere else.
+  #
   # Checks run on a background thread, not the request thread: a per-process refresher updates a
   # cached snapshot every health_refresh_interval seconds and #show serves that snapshot, so a slow
   # or wedged dependency can't tie up the Passenger worker pool. Each check also runs under
@@ -124,7 +129,7 @@ module Usps::Support
 
       response.set_header('Cache-Control', 'no-store')
       response.set_header('Retry-After', '30') unless healthy
-      render(plain: body, content_type: 'text/plain', status: healthy ? :ok : :service_unavailable)
+      render(plain: body, content_type: 'text/plain', status: response_status(healthy))
     end
 
     # Fallback for the (rare) case where not even the first refresh could produce a snapshot.
@@ -132,9 +137,26 @@ module Usps::Support
       response.set_header('Cache-Control', 'no-store')
       response.set_header('Retry-After', '30')
       render(plain: "HEALTHCHECK_FAIL #{app_name}\nsnapshot=unavailable\n",
-             content_type: 'text/plain', status: :service_unavailable)
+             content_type: 'text/plain', status: response_status(false))
     end
 
+    # True when the caller asked to be judged on the body alone (?probe=1).
+    def probe_mode? = params[:probe].present?
+
+    # A Route 53 HTTPS_STR_MATCH probe decides health by matching the sentinel in the body, so for it
+    # the status code says nothing the body has not already said. That redundancy is not free: the
+    # ALB counts a 503 on this path as an application 5XX, landing it in HTTPCode_Target_5XX_Count
+    # next to genuine user-facing errors. A slow dependency then pages on an endpoint no user ever
+    # touched (2026-08-05: 155 such 5XX across exams and merit-marks, all of them this endpoint
+    # answering the Route 53 checker, none of them a real request).
+    #
+    # Probe-mode callers therefore get 200 with the identical body -- still HEALTHCHECK_FAIL, still
+    # every per-check line, so the probe goes red exactly as before. Everyone else keeps the
+    # status-coded contract, which is what a human curl or a status-code-driven monitor expects.
+    # A crashed app or dead worker still yields the web server's own 5xx with no sentinel, so total
+    # failure remains detectable either way.
+    def response_status(healthy) = healthy || probe_mode? ? :ok : :service_unavailable
+
     # One round of checks + diagnostics, invoked by the monitor's runner (background thread, or the
     # inline cold/stale path). Wrapped in the Rails executor so ActiveRecord connections checked out
     # by the DB checks are returned even though this runs outside a request. Returns the render data.

data/db/hq/members_schema.rb

@@ -36,18 +36,16 @@ ActiveRecord::Schema[8.1].define do
     t.string "died", limit: 8
   end
 
-  create_table "djdesc", primary_key: "jobcode", id: { type: :string, limit: 5 }, charset: "latin1", comment: "dtb-created daily has active dist Job descritpions", force: :cascade do |t|
+  create_table "djdesc", primary_key: "jobcode", id: { type: :string, limit: 7 }, charset: "latin1", comment: "dtb-created daily has active dist Job descritpions", force: :cascade do |t|
     t.string "jdesc", limit: 100
     t.string "rank", limit: 3, null: false
     t.string "prank", limit: 3, null: false
-    t.string "OD1", limit: 1, null: false
-    t.string "OD2", limit: 1, null: false
-    t.string "ED1", limit: 1, null: false
+    t.string "type", limit: 1, null: false
+    t.string "active", limit: 1, null: false
+    t.string "admin", limit: 5, null: false
+    t.string "map", limit: 1, null: false
     t.string "Lev", limit: 1, null: false
-    t.string "EGA", limit: 1, null: false
     t.string "Descript", limit: 7, null: false
-    t.string "OP", limit: 1
-    t.string "Sp", limit: 1
   end
 
   create_table "djftp", id: false, charset: "latin1", comment: "dtb - Current District Jobs loaded from HQ data", force: :cascade do |t|
@@ -170,18 +168,16 @@ ActiveRecord::Schema[8.1].define do
     t.string "RankAbbr", limit: 15
   end
 
-  create_table "sjdesc", primary_key: "jobcode", id: { type: :string, limit: 5 }, charset: "latin1", comment: "dtb-created daily has active squad Job descritpions", force: :cascade do |t|
+  create_table "sjdesc", primary_key: "jobcode", id: { type: :string, limit: 7 }, charset: "latin1", comment: "dtb-created daily has active squad Job descritpions", force: :cascade do |t|
     t.string "jdesc", limit: 100
     t.string "rank", limit: 3, null: false
     t.string "prank", limit: 3, null: false
-    t.string "OD1", limit: 1, null: false
-    t.string "OD2", limit: 1, null: false
-    t.string "ED1", limit: 1, null: false
+    t.string "type", limit: 1, null: false
+    t.string "active", limit: 1, null: false
+    t.string "admin", limit: 5, null: false
+    t.string "map", limit: 1, null: false
     t.string "Lev", limit: 1, null: false
-    t.string "EGA", limit: 1, null: false
     t.string "Descript", limit: 7, null: false
-    t.string "OP", limit: 1
-    t.string "Sp", limit: 1
   end
 
   create_table "sjftp", id: false, charset: "latin1", comment: "dtb-created daily from HQ active squadron jobs", force: :cascade do |t|

data/lib/usps/support/version.rb

@@ -2,6 +2,6 @@
 
 module Usps
   module Support
-    VERSION = '0.2.54'
+    VERSION = '0.2.56'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps-support
 version: !ruby/object:Gem::Version
-  version: 0.2.54
+  version: 0.2.56
 platform: ruby
 authors:
 - Julian Fiander