From 6562d113f5b392345e1a6139e8f506e1399e8d93 Mon Sep 17 00:00:00 2001 From: Nathan Broadbent Date: Fri, 23 Jan 2026 16:53:33 +1300 Subject: [PATCH] Configure LogStruct for log_bench testing --- Gemfile | 3 ++- Gemfile.lock | 13 +++++++++++-- app/controllers/home_controller.rb | 7 ++++++- app/sidekiq/test_sidekiq_job.rb | 10 ++++++---- config/initializers/log_bench.rb | 5 ----- config/initializers/sidekiq.rb | 6 ++++-- test/controllers/home_controller_test.rb | 2 +- 7 files changed, 30 insertions(+), 16 deletions(-) delete mode 100644 config/initializers/log_bench.rb diff --git a/Gemfile b/Gemfile index 4210e9d..59421d0 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,8 @@ end group :development do # Use console on exceptions pages [https://github.com/rails/web-console] gem "web-console" - gem "log_bench", path: "../log_bench" + gem "log_bench", path: ".." + gem "logstruct" gem "sidekiq" gem "redis" end diff --git a/Gemfile.lock b/Gemfile.lock index a095c3b..467d658 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH - remote: ../log_bench + remote: .. specs: - log_bench (0.5.3) + log_bench (0.6.0) curses (~> 1.5) lograge (~> 0.14) net-http (~> 0.6) @@ -157,6 +157,11 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) + logstruct (0.1.9) + lograge (>= 0.11) + rails (>= 7.1) + semantic_logger (~> 4.15) + sorbet-runtime (>= 0.5) loofah (2.24.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -315,6 +320,8 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 4.0) websocket (~> 1.0) + semantic_logger (4.17.0) + concurrent-ruby (~> 1.0) sidekiq (8.0.10) connection_pool (>= 2.5.0) json (>= 2.9.0) @@ -337,6 +344,7 @@ GEM fugit (~> 1.11.0) railties (>= 7.1) thor (>= 1.3.1) + sorbet-runtime (0.6.12894) sqlite3 (2.7.4-aarch64-linux-gnu) sqlite3 (2.7.4-aarch64-linux-musl) sqlite3 (2.7.4-arm-linux-gnu) @@ -405,6 +413,7 @@ DEPENDENCIES jbuilder kamal log_bench! + logstruct propshaft puma (>= 5.0) rails (~> 8.0.2) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index a53adef..325fc8c 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,8 +1,13 @@ class HomeController < ApplicationController def index Rails.logger.info "HomeController#index before TestJob at #{Time.now}" + + # Run some SQL queries for testing + ActiveRecord::Base.connection.execute("SELECT 1 AS test_query") + ActiveRecord::Base.connection.execute("SELECT sqlite_version()") + TestJob.set(wait: 2.seconds).perform_later - TestSidekiqJob.perform_async + TestSidekiqJob.perform_async if defined?(Sidekiq) Rails.logger.info "HomeController#index after TestJob at #{Time.now}" end end diff --git a/app/sidekiq/test_sidekiq_job.rb b/app/sidekiq/test_sidekiq_job.rb index 2feb713..960f940 100644 --- a/app/sidekiq/test_sidekiq_job.rb +++ b/app/sidekiq/test_sidekiq_job.rb @@ -1,7 +1,9 @@ -class TestSidekiqJob - include Sidekiq::Job +if defined?(Sidekiq) + class TestSidekiqJob + include Sidekiq::Job - def perform(*args) - logger.info "TestSidekiqJob#perform at #{Time.now}" + def perform(*args) + logger.info "TestSidekiqJob#perform at #{Time.now}" + end end end diff --git a/config/initializers/log_bench.rb b/config/initializers/log_bench.rb deleted file mode 100644 index b73d899..0000000 --- a/config/initializers/log_bench.rb +++ /dev/null @@ -1,5 +0,0 @@ -# if defined?(LogBench) -# LogBench.setup do |config| -# -# end -# end diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 7576a3a..5a142f2 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -1,3 +1,5 @@ -Sidekiq.configure_server do |config| - config.logger = Rails.logger +if defined?(Sidekiq) + Sidekiq.configure_server do |config| + config.logger = Rails.logger + end end diff --git a/test/controllers/home_controller_test.rb b/test/controllers/home_controller_test.rb index f6f3785..7f62d83 100644 --- a/test/controllers/home_controller_test.rb +++ b/test/controllers/home_controller_test.rb @@ -2,7 +2,7 @@ class HomeControllerTest < ActionDispatch::IntegrationTest test "should get index" do - get home_index_url + get root_url assert_response :success end end