Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ gem "fastruby-styleguide", github: "fastruby/styleguide", branch: "gh-pages"
gem "omniauth"
gem "omniauth-google-oauth2"

group :development, :production do
gem "sidekiq"
gem "sidekiq-scheduler"
end

group :development, :test do
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
gem "debug", platforms: %i[ mri windows ], require: "debug/prelude"
Expand Down
16 changes: 0 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,6 @@ GEM
erb
psych (>= 4.0.0)
redcarpet (3.6.1)
redis-client (0.24.0)
connection_pool
regexp_parser (2.10.0)
reline (0.6.1)
io-console (~> 0.5)
Expand Down Expand Up @@ -422,8 +420,6 @@ GEM
rubocop-rails (>= 2.30)
ruby-progressbar (1.13.0)
rubyzip (3.4.0)
rufus-scheduler (3.9.2)
fugit (~> 1.1, >= 1.11.1)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-embedded (1.93.2-aarch64-linux-gnu)
Expand Down Expand Up @@ -467,16 +463,6 @@ GEM
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
logger
sidekiq (7.3.9)
base64
connection_pool (>= 2.3.0)
logger
rack (>= 2.2.4)
redis-client (>= 0.22.2)
sidekiq-scheduler (5.0.6)
rufus-scheduler (~> 3.2)
sidekiq (>= 6, < 8)
tilt (>= 1.4.0, < 3)
slack-ruby-block-kit (0.26.0)
zeitwerk (~> 2.6)
slack-ruby-client (2.6.0)
Expand Down Expand Up @@ -596,8 +582,6 @@ DEPENDENCIES
selenium-webdriver
sentry-rails
sentry-ruby
sidekiq
sidekiq-scheduler
slack-ruby-block-kit (>= 0.24.0)
slack-ruby-client (>= 2.4.0)
solid_cable
Expand Down
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
release: rake db:migrate
web: bundle exec puma -C config/puma.rb
worker: bundle exec sidekiq -c 2 -q default
worker: bundle exec bin/jobs
bot: bundle exec rake discord:start_bot
5 changes: 5 additions & 0 deletions app/assets/builds/application.css

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ class Application < Rails::Application
# Common ones are `templates`, `generators`, or `middleware`, for example.
config.autoload_lib(ignore: %w[assets tasks])

config.active_job.queue_adapter = :sidekiq
config.active_job.queue_adapter = :solid_queue
config.solid_queue.connects_to = { database: { writing: :queue } }

# Configuration for the application, engines, and railties goes here.
#
Expand Down
18 changes: 14 additions & 4 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,13 @@ default: &default


development:
<<: *default
database: ruby_or_rails_development
primary:
<<: *default
database: ruby_or_rails_development
queue:
<<: *default
database: ruby_or_rails_development_queue
migrations_paths: db/queue_migrate

# The specified database role being used to connect to PostgreSQL.
# To create additional roles in PostgreSQL see `$ createuser --help`.
Expand Down Expand Up @@ -60,8 +65,13 @@ development:
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
<<: *default
database: ruby_or_rails_test
primary:
<<: *default
database: ruby_or_rails_test
queue:
<<: *default
database: ruby_or_rails_test_queue
migrations_paths: db/queue_migrate

# As with config/credentials.yml, you never want to store sensitive information,
# like your database password, in your source code. If your source code is
Expand Down
17 changes: 0 additions & 17 deletions config/initializers/sidekiq.rb

This file was deleted.

26 changes: 16 additions & 10 deletions config/recurring.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
# production:
# periodic_cleanup:
# class: CleanSoftDeletedRecordsJob
# queue: background
# args: [ 1000, { batch_size: 500 } ]
# schedule: every hour
# periodic_command:
# command: "SoftDeletedRecord.due.delete_all"
# priority: 2
# schedule: at 5am every day
default: &default
daily_puzzle_job:
class: DailyPuzzleJob
schedule: "0 9 * * *" # every day at 9:00 AM
weekly_leaderboard_job:
class: WeeklyLeaderboardJob
schedule: "0 0 * * 0" # every Sunday at midnight
puzzle_inventory_check:
class: PuzzleInventoryCheckJob
schedule: "0 10 * * *" # every day at 10:00 AM

development:
<<: *default

production:
<<: *default
13 changes: 0 additions & 13 deletions config/sidekiq.yml

This file was deleted.

Loading