use APP_ENV instead of RAILS_ENV (#106)

fast-programmer · Aug 12, 2024 · ef2ad35 · ef2ad35
1 parent ae0f73c
commit ef2ad35
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -54,9 +54,9 @@ jobs:
         export PGPASSWORD=outboxer_password
         psql -h localhost -U outboxer_developer -d outboxer_test -c 'SELECT version();'
     - name: run database migrations
-      run: RAILS_ENV=test bin/rake outboxer:db:migrate
+      run: APP_ENV=test bin/rake outboxer:db:migrate
     - name: run rspec
-      run: RAILS_ENV=test bin/rspec spec
+      run: APP_ENV=test bin/rspec spec
 
   mysql:
     runs-on: ubuntu-latest
@@ -96,15 +96,15 @@ jobs:
         mysql -h 127.0.0.1 -P 3306 -u outboxer_developer -poutboxer_password outboxer_test -e 'SELECT VERSION();'
     - name: run database migrations
       env:
-        RAILS_ENV: test
+        APP_ENV: test
         DATABASE_ADAPTER: mysql2
         DATABASE_HOST: 127.0.0.1
         DATABASE_PORT: 3306
       run: |
         bin/rake outboxer:db:migrate
     - name: run rspec
       env:
-        RAILS_ENV: test
+        APP_ENV: test
         DATABASE_ADAPTER: mysql2
         DATABASE_PORT: 3306
         DATABASE_HOST: 127.0.0.1

diff --git a/bin/console b/bin/console
@@ -5,7 +5,7 @@ require 'bundler/setup'
 require 'outboxer'
 require 'sidekiq'
 
-environment = ENV['RAILS_ENV'] || 'development'
+environment = ENV['APP_ENV'] || 'development'
 config = Outboxer::Database.config(environment: environment, pool: 1)
 Outboxer::Database.connect(config: config)
 

diff --git a/bin/outboxer_published_messages_deleter b/bin/outboxer_published_messages_deleter
@@ -30,7 +30,7 @@ interval = options[:interval] || 1
 retention_period = options[:retention_period] || 10
 batch_size = options[:batch_size] || 100
 
-environment = ENV['RAILS_ENV'] || 'development'
+environment = ENV['APP_ENV'] || 'development'
 
 logger = Outboxer::Logger.new($stdout, level: log_level)
 

diff --git a/bin/outboxer_publisher b/bin/outboxer_publisher
@@ -32,7 +32,7 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-environment = ENV['RAILS_ENV'] || 'development'
+environment = ENV['APP_ENV'] || 'development'
 
 require_relative '../app/jobs/event_created_job'
 

diff --git a/bin/outboxer_publishermon b/bin/outboxer_publishermon
@@ -27,7 +27,7 @@ def outboxer_publisher_pids
   `pgrep -f bin/outboxer_publisher$`.strip.split("\n")
 end
 
-environment = ENV['RAILS_ENV'] || 'development'
+environment = ENV['APP_ENV'] || 'development'
 config = Outboxer::Database.config(environment: environment)
 Outboxer::Database.connect(config: config.merge('pool' => 1))
 

diff --git a/config/sidekiq.rb b/config/sidekiq.rb
@@ -5,7 +5,7 @@
 
 require_relative '../app/jobs/event_created_job'
 
-environment = ENV['RAILS_ENV'] || 'development'
+environment = ENV['APP_ENV'] || 'development'
 
 db_config_content = File.read('config/database.yml')
 db_config_erb_result = ERB.new(db_config_content).result

diff --git a/lib/outboxer/web.rb b/lib/outboxer/web.rb
@@ -8,7 +8,7 @@
 
 require 'pry-byebug'
 
-environment = ENV['RAILS_ENV'] || 'development'
+environment = ENV['APP_ENV'] || 'development'
 config = Outboxer::Database.config(environment: environment, pool: 1)
 Outboxer::Database.connect(config: config)
 

diff --git a/tasks/database.rake b/tasks/database.rake
@@ -6,7 +6,7 @@ require 'pry-byebug'
 namespace :outboxer do
   namespace :db do
     task :drop do
-      environment = ENV['RAILS_ENV'] || 'development'
+      environment = ENV['APP_ENV'] || 'development'
       db_config = Outboxer::Database.config(environment: environment, pool: 1)
 
       ActiveRecord::Base.establish_connection(db_config.merge('database' => 'postgres'))
@@ -15,7 +15,7 @@ namespace :outboxer do
     end
 
     task :create do
-      environment = ENV['RAILS_ENV'] || 'development'
+      environment = ENV['APP_ENV'] || 'development'
       db_config = Outboxer::Database.config(environment: environment, pool: 1)
 
       ActiveRecord::Base.establish_connection(db_config.merge('database' => 'postgres'))
@@ -24,7 +24,7 @@ namespace :outboxer do
     end
 
     task :migrate do
-      environment = ENV['RAILS_ENV'] || 'development'
+      environment = ENV['APP_ENV'] || 'development'
       db_config = Outboxer::Database.config(environment: environment, pool: 1)
       ActiveRecord::Base.establish_connection(db_config)
 
@@ -44,7 +44,7 @@ namespace :outboxer do
     end
 
     task :seed do
-      environment = ENV['RAILS_ENV'] || 'development'
+      environment = ENV['APP_ENV'] || 'development'
       db_config = Outboxer::Database.config(environment: environment, pool: 1)
       ActiveRecord::Base.establish_connection(db_config)
 
@@ -59,8 +59,8 @@ namespace :outboxer do
   end
 end
 
-# RAILS_ENV=development bin/rake outboxer:db:drop
-# RAILS_ENV=development bin/rake outboxer:db:create
-# RAILS_ENV=development bin/rake outboxer:db:migrate
-# RAILS_ENV=development bin/rake outboxer:db:seed
-# RAILS_ENV=development bin/rake outboxer:db:reset
+# APP_ENV=development bin/rake outboxer:db:drop
+# APP_ENV=development bin/rake outboxer:db:create
+# APP_ENV=development bin/rake outboxer:db:migrate
+# APP_ENV=development bin/rake outboxer:db:seed
+# APP_ENV=development bin/rake outboxer:db:reset