diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index eb632340..b4068664 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -25,15 +25,6 @@ services: DATABASE_USERNAME: postgres DATABASE_PASSWORD: password DATABASE_NAME: dawarich_development - # PostgreSQL database name for solid_queue - QUEUE_DATABASE_HOST: dawarich_db - QUEUE_DATABASE_USERNAME: postgres - QUEUE_DATABASE_PASSWORD: password - QUEUE_DATABASE_PORT: 5432 - QUEUE_DATABASE_NAME: dawarich_development_queue - # SQLite database paths for cache and cable databases - CACHE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cache.sqlite3 - CABLE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cable.sqlite3 MIN_MINUTES_SPENT_IN_CITY: 60 APPLICATION_HOSTS: localhost TIME_ZONE: Europe/London diff --git a/config/environments/development.rb b/config/environments/development.rb index dfad5b2f..c177d97e 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -67,14 +67,6 @@ Rails.application.configure do # Highlight code that enqueued background job in logs. config.active_job.verbose_enqueue_logs = true - config.active_job.queue_adapter = :solid_queue - config.solid_queue.silence_polling = true - # :queue is the name of the database connection - config.solid_queue.connects_to = { database: { writing: :queue } } - - config.mission_control.jobs.http_basic_auth_enabled = false - config.solid_queue.logger = ActiveSupport::Logger.new($stdout) - # Suppress logger output for asset requests. config.assets.quiet = true diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb index e38248d0..9c115fd7 100644 --- a/config/initializers/geocoder.rb +++ b/config/initializers/geocoder.rb @@ -4,7 +4,7 @@ settings = { debug_mode: true, timeout: 5, units: :km, - cache: cache: Redis.new, + cache: Redis.new, always_raise: :all, http_headers: { 'User-Agent' => "Dawarich #{APP_VERSION} (https://dawarich.app)" diff --git a/docker/docker-compose.production.yml b/docker/docker-compose.production.yml index 37aeb19a..c47c73d0 100644 --- a/docker/docker-compose.production.yml +++ b/docker/docker-compose.production.yml @@ -62,15 +62,6 @@ services: DATABASE_USERNAME: postgres DATABASE_PASSWORD: password DATABASE_NAME: dawarich_production - # PostgreSQL database name for solid_queue - QUEUE_DATABASE_NAME: dawarich_production_queue - QUEUE_DATABASE_PASSWORD: password - QUEUE_DATABASE_USERNAME: postgres - QUEUE_DATABASE_HOST: dawarich_db - QUEUE_DATABASE_PORT: 5432 - # SQLite database paths for cache and cable databases - CACHE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_production_cache.sqlite3 - CABLE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_production_cable.sqlite3 MIN_MINUTES_SPENT_IN_CITY: 60 APPLICATION_HOSTS: localhost,::1,127.0.0.1 TIME_ZONE: Europe/London diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 220719fc..7b4d66a6 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -64,15 +64,6 @@ services: DATABASE_USERNAME: postgres DATABASE_PASSWORD: password DATABASE_NAME: dawarich_development - # PostgreSQL database name for solid_queue - QUEUE_DATABASE_NAME: dawarich_development_queue - QUEUE_DATABASE_PASSWORD: password - QUEUE_DATABASE_USERNAME: postgres - QUEUE_DATABASE_HOST: dawarich_db - QUEUE_DATABASE_PORT: 5432 - # SQLite database paths for cache and cable databases - CACHE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cache.sqlite3 - CABLE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cable.sqlite3 MIN_MINUTES_SPENT_IN_CITY: 60 APPLICATION_HOSTS: localhost TIME_ZONE: Europe/London