From 6f6ec6592d5a930756e1d09411d88866a71fa045 Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 16 Jan 2021 12:13:14 -0600 Subject: [PATCH] Fix #4668: Add running commit to /status page. --- app/logical/server_status.rb | 5 +++++ app/views/status/show.html.erb | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/logical/server_status.rb b/app/logical/server_status.rb index acada60b1..6076e3cd0 100644 --- a/app/logical/server_status.rb +++ b/app/logical/server_status.rb @@ -9,6 +9,7 @@ class ServerStatus hostname: hostname, uptime: uptime, loadavg: loadavg, + danbooru_version: danbooru_version, ruby_version: RUBY_VERSION, distro_version: distro_version, kernel_version: kernel_version, @@ -41,6 +42,10 @@ class ServerStatus File.read("/proc/loadavg").chomp end + def danbooru_version + Rails.application.config.x.git_hash + end + def kernel_version File.read("/proc/version").chomp end diff --git a/app/views/status/show.html.erb b/app/views/status/show.html.erb index c0f138359..7fd3d3af7 100644 --- a/app/views/status/show.html.erb +++ b/app/views/status/show.html.erb @@ -2,6 +2,10 @@

Status

+

Running <%= external_link_to "#{Danbooru.config.source_code_url}/commits/#{@status.danbooru_version}", @status.danbooru_version.first(7) %>.

+ +

Server

+
Server: <%= @status.hostname %> @@ -9,7 +13,7 @@ <%= render "list", hash: @status.serializable_hash[:status] %>
-

Postgres

+

Postgres

@@ -19,7 +23,7 @@ <%= render "table", rows: @status.serializable_hash[:postgres][:connection_stats] %>
-

Redis

+

Redis