Skip to content

Commit

Permalink
completely disable usage report job if not active
Browse files Browse the repository at this point in the history
  • Loading branch information
Floppy committed May 17, 2024
1 parent f4edb61 commit 0fe7da6
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,4 @@ gem "logstash-event", "~> 1.2"

gem "climate_control", "~> 1.2", group: :test

gem "sidekiq-scheduler", "~> 5.0"
gem "sidekiq-scheduler", github: "manyfold3d/sidekiq-scheduler", branch: "fix-dynamic-schedule-load-on-boot"
16 changes: 11 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ GIT
opengl-bindings
rubyzip

GIT
remote: https://github.com/manyfold3d/sidekiq-scheduler.git
revision: 8eb248143c89fae273d66a57b41b474b7006f2bd
branch: fix-dynamic-schedule-load-on-boot
specs:
sidekiq-scheduler (5.0.3)
rufus-scheduler (~> 3.2)
sidekiq (>= 6, < 8)
tilt (>= 1.4.0, < 3)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -485,10 +495,6 @@ GEM
redis-client (>= 0.19.0)
sidekiq-failures (1.0.4)
sidekiq (>= 4.0.0)
sidekiq-scheduler (5.0.3)
rufus-scheduler (~> 3.2)
sidekiq (>= 6, < 8)
tilt (>= 1.4.0)
simple_po_parser (1.1.6)
simplecov (0.22.0)
docile (~> 1.1)
Expand Down Expand Up @@ -629,7 +635,7 @@ DEPENDENCIES
scout_apm
sidekiq (~> 7.2)
sidekiq-failures (~> 1.0)
sidekiq-scheduler (~> 5.0)
sidekiq-scheduler!
simplecov (~> 0.22.0)
spdx (~> 4.1)
spring
Expand Down
6 changes: 1 addition & 5 deletions app/controllers/settings_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,7 @@ def update_analysis_settings(settings)

def update_usage_settings(settings)
return unless settings
if settings[:report] == "1"
SiteSettings.anonymous_usage_id ||= SecureRandom.uuid
else
SiteSettings.anonymous_usage_id = nil
end
(settings[:report] == "1") ? UsageReport.enable! : UsageReport.disable!
end

def get_user
Expand Down
10 changes: 10 additions & 0 deletions app/lib/usage_report.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,14 @@ def self.generate
end
end
end

def self.enable!
SiteSettings.anonymous_usage_id ||= SecureRandom.uuid
Sidekiq.set_schedule("usage", {every: "1d", class: "UsageReportingJob"})
end

def self.disable!
SiteSettings.anonymous_usage_id = nil
Sidekiq.remove_schedule("usage")
end
end
6 changes: 2 additions & 4 deletions config/sidekiq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@
- default
- analysis
:scheduler:
:schedule:
usage:
every: '1d'
class: UsageReportingJob
:dynamic: true
:dynamic_every: 15s

0 comments on commit 0fe7da6

Please sign in to comment.