web47core 3.2.3.40 → 3.2.3.41
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/status_controller.rb +23 -9
- data/lib/web47core/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5167f51146e44ae39a5cb3411634be0fcef03e696859bb7eabf9fe7222ad65a0
|
|
4
|
+
data.tar.gz: 4a7c22205a6b2033c41cccce824db4cf6be86e11fec06578165fab0c367aff20
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fc25f298a11e9bb9d70feba03cdc92f4bf61918f740e7f40d6eb1fce5bb0d0613933c18e248877bf0fdc3b10cc58711fff64e501eba95c7435830906639e9a1e
|
|
7
|
+
data.tar.gz: 9602c563c2118543ab4cc6858ba668854f599f85342cbf08a08f639d7e2e95093203fafc6e57760c8e93e32e08043c340744e684dd89cfceede3f4a64c5e625f
|
|
@@ -13,7 +13,8 @@ class StatusController < ActionController::Base
|
|
|
13
13
|
redis: redis_status,
|
|
14
14
|
jobs: delayed_jobs_status,
|
|
15
15
|
cron_job_servers: cron_job_servers_status,
|
|
16
|
-
workers: workers_status
|
|
16
|
+
workers: workers_status,
|
|
17
|
+
version: version_status }
|
|
17
18
|
|
|
18
19
|
respond_to do |format|
|
|
19
20
|
format.html { render :index, locals: { components: ui_decorators(components) }, layout: false }
|
|
@@ -105,18 +106,13 @@ class StatusController < ActionController::Base
|
|
|
105
106
|
end
|
|
106
107
|
|
|
107
108
|
#
|
|
108
|
-
# Cron job primary status
|
|
109
|
+
# Cron job primary status. Up or down only. Host, pid, and check-in time stay on the admin page.
|
|
109
110
|
#
|
|
110
111
|
def cron_job_servers_status
|
|
111
112
|
server = cron_job_server
|
|
112
|
-
raise '
|
|
113
|
+
raise 'Down' if server.blank? || server.dead?
|
|
113
114
|
|
|
114
|
-
|
|
115
|
-
raise "Primary Server is DEAD: #{server_info}" if server.dead?
|
|
116
|
-
|
|
117
|
-
report_success "Primary Server is alive: #{server_info}",
|
|
118
|
-
primary_count: 1,
|
|
119
|
-
total_count: Cron::Server.count
|
|
115
|
+
report_success 'Up', primary_count: 1, total_count: Cron::Server.count
|
|
120
116
|
rescue StandardError => error
|
|
121
117
|
report_error(error, primary_count: 0, total_count: Cron::Server.count)
|
|
122
118
|
end
|
|
@@ -138,4 +134,22 @@ class StatusController < ActionController::Base
|
|
|
138
134
|
def cron_job_server
|
|
139
135
|
@cron_job_server ||= Cron::Server.primary_server
|
|
140
136
|
end
|
|
137
|
+
|
|
138
|
+
#
|
|
139
|
+
# Deployed image identity. GIT_SHA and BUILT_AT are injected at image build time.
|
|
140
|
+
# Missing values stay successful so an older task does not fail the health check.
|
|
141
|
+
#
|
|
142
|
+
def version_status
|
|
143
|
+
built_at = ENV['BUILT_AT'].presence
|
|
144
|
+
git_sha = ENV['GIT_SHA'].presence
|
|
145
|
+
report_success(version_message(built_at, git_sha), built_at: built_at, git_sha: git_sha)
|
|
146
|
+
end
|
|
147
|
+
|
|
148
|
+
def version_message(built_at, git_sha)
|
|
149
|
+
return 'Version not set' if built_at.blank? && git_sha.blank?
|
|
150
|
+
return built_at if git_sha.blank?
|
|
151
|
+
return git_sha if built_at.blank?
|
|
152
|
+
|
|
153
|
+
"#{built_at} #{git_sha}"
|
|
154
|
+
end
|
|
141
155
|
end
|
data/lib/web47core/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: web47core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.2.3.
|
|
4
|
+
version: 3.2.3.41
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Chris Schroeder
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2026-09-
|
|
11
|
+
date: 2026-09-30 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activemodel
|