github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 02:13:47 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

DEV: Remove db_timeout setting (#22912)

Browse Source 
It doesn't actually do anything.
This commit is contained in:
Daniel Waterworth 2023-08-01 14:17:43 -05:00 committed by GitHub
parent 945bb9161f
commit 50d527b80c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/global_setting.rb
View File

@ -125,7 +125,6 @@ class GlobalSetting
%w[ %w[
pool pool
connect_timeout connect_timeout
timeout
socket socket
host host
backup_host backup_host

3
config/database.yml
View File

@ -4,7 +4,6 @@ development:
database: <%= ENV['DISCOURSE_DEV_DB'] || 'discourse_development' %> database: <%= ENV['DISCOURSE_DEV_DB'] || 'discourse_development' %>
min_messages: warning min_messages: warning
pool: 5 pool: 5
timeout: 5000
checkout_timeout: <%= ENV['CHECKOUT_TIMEOUT'] || 5 %> checkout_timeout: <%= ENV['CHECKOUT_TIMEOUT'] || 5 %>
host_names: host_names:
### Don't include the port number here. Change the "port" site setting instead, at /admin/site_settings. ### Don't include the port number here. Change the "port" site setting instead, at /admin/site_settings.
@ -38,7 +37,6 @@ test:
database: <%= test_db %> database: <%= test_db %>
min_messages: warning min_messages: warning
pool: 5 pool: 5
timeout: 5000
host_names: host_names:
- test.localhost - test.localhost
@ -49,7 +47,6 @@ profile:
database: discourse_profile database: discourse_profile
min_messages: warning min_messages: warning
pool: 5 pool: 5
timeout: 5000
host_names: host_names:
- "localhost" - "localhost"
# You may be surprised production is not here, it is sourced from application.rb using a monkey patch # You may be surprised production is not here, it is sourced from application.rb using a monkey patch

5
config/discourse_defaults.conf
View File

@ -10,16 +10,13 @@
# 2. You can copy this file to config/discourse.conf and amend with your settings # 2. You can copy this file to config/discourse.conf and amend with your settings
# 3. You can pass in config from your environment, all the settings below are available. # 3. You can pass in config from your environment, all the settings below are available.
# Append DISCOURSE_ and upper case the setting in ENV. For example: # Append DISCOURSE_ and upper case the setting in ENV. For example:
# to pass in db_timeout of 200 you would use DISCOURSE_DB_TIMEOUT=200 # to pass in db_pool of 200 you would use DISCOURSE_DB_POOL=200
# All settings apply to production only # All settings apply to production only
# connection pool size, sidekiq is set to 5, allowing an extra 3 for bg threads # connection pool size, sidekiq is set to 5, allowing an extra 3 for bg threads
db_pool = 8 db_pool = 8
# ActiveRecord connection pool timeout in milliseconds
db_timeout = 5000
# Database connection timeout in seconds # Database connection timeout in seconds
db_connect_timeout = 5 db_connect_timeout = 5