Skip to content
Merged
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
4 changes: 0 additions & 4 deletions frameworks/Ruby/padrino/app/controllers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
response['Server'] = 'padrino'
end

after do
response['Date'] = Time.now.httpdate
end if defined?(Puma)

get '/json', :provides => [:json] do
{message: "Hello, World!"}.to_json
end
Expand Down
11 changes: 3 additions & 8 deletions frameworks/Ruby/padrino/config/database.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,9 @@
}

# Determine threading/thread pool size and timeout
if defined?(Puma) && (threads = Puma.cli_config.options.fetch(:max_threads)) > 1
opts[:pool] = threads
opts[:checkout_timeout] = 10
else
# TODO: ActiveRecord doesn't have a single-threaded mode?
opts[:pool] = 1
opts[:checkout_timeout] = 0
end
# TODO: ActiveRecord doesn't have a single-threaded mode?
opts[:pool] = 512
opts[:checkout_timeout] = 5


# Setup our logger
Expand Down
Loading