Adding config for puma, dashboard layout, fixing some queries

This commit is contained in:
Eugen Rochko 2016-03-12 16:09:46 +01:00
parent 447cfef62d
commit aab9f57e36
25 changed files with 264 additions and 134 deletions

View file

@ -29,8 +29,9 @@ module Mastodon
config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')]
config.to_prepare do
Doorkeeper::AuthorizationsController.layout 'auth'
Doorkeeper::AuthorizedApplicationsController.layout 'auth'
Doorkeeper::ApplicationsController.layout 'dashboard'
Doorkeeper::AuthorizedApplicationsController.layout 'dashboard'
Doorkeeper::AuthorizationsController.layout 'auth'
end
end
end

View file

@ -1 +1 @@
$redis = Redis.new(host: ENV['REDIS_HOST'] || 'localhost', port: ENV['REDIS_PORT'] || 6379)
$redis = Redis.new(host: ENV['REDIS_HOST'] || 'localhost', port: ENV['REDIS_PORT'] || 6379, driver: :hiredis)

13
config/puma.rb Normal file
View file

@ -0,0 +1,13 @@
workers Integer(ENV['WEB_CONCURRENCY'] || 2)
threads_count = Integer(ENV['MAX_THREADS'] || 5)
threads threads_count, threads_count
preload_app!
rackup DefaultRackup
port ENV['PORT'] || 3000
environment ENV['RACK_ENV'] || 'development'
on_worker_boot do
ActiveRecord::Base.establish_connection
end

View file

@ -49,5 +49,7 @@ Rails.application.routes.draw do
end
end
get '/mentions', to: 'home#mentions', as: :mentions
root 'home#index'
end