Merge branch 'development'

true-runes · Jun 23, 2018 · c463d62 · c463d62
2 parents 015b8fa + e7b7fda
commit c463d62
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
@@ -4,7 +4,7 @@
 set :branch, :master
 set :deploy_to, ENV["DEPLOY_DIR_FOR_PRODUCTION"]
 set :rails_env, 'production'
-server ENV["DEPLOY_SERVER"], user: ENV["DEPLOY_USER_FOR_PRODUCTION"], roles: %w{web app db} # wheneverは無効化
+server ENV["DEPLOY_SERVER"], user: ENV["DEPLOY_USER_FOR_PRODUCTION"], roles: %w{web app db batch}
 
 set :ssh_options, {
   port: ENV["DEPLOY_SERVER_PORT"],

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -18,7 +18,8 @@
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
   if Rails.root.join('tmp', 'caching-dev.txt').exist?
-    config.action_controller.perform_caching = true
+    # config.action_controller.perform_caching = true
+    config.action_controller.perform_caching = false
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {

diff --git a/config/schedule.rb b/config/schedule.rb
@@ -4,6 +4,8 @@
 set :output, "#{Rails.root}/log/whenever.log"
 env :PATH, ENV['PATH']
 
-every 1.minute do
-  runner "TwitterApi::Tasks::SearchAndUpsertTweets.execute(search_word: '#幻水総選挙2018')"
-end
+if @environment.to_sym == :production
+  every 1.minute, roles: [:batch] do
+    runner "TwitterApi::Tasks::SearchAndUpsertTweets.execute(search_word: '#幻水総選挙2018')"
+  end
+end