Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX(cache_critical_dns): use discourse database name and user by default (#16856)

This commit is contained in:
Gabe Pacuilla 2022-05-17 16:09:32 -04:00 committed by Michael Fitz-Payne
parent 924ef90eed
commit ab88591536
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
script/cache_critical_dns
View File

@ -20,6 +20,9 @@ CRITICAL_HOST_ENV_VARS = %w{
DISCOURSE_REDIS_SLAVE_HOST DISCOURSE_REDIS_SLAVE_HOST
DISCOURSE_REDIS_REPLICA_HOST DISCOURSE_REDIS_REPLICA_HOST
} }
DEFAULT_DB_NAME = "discourse"
HOST_RESOLVER_CACHE = {} HOST_RESOLVER_CACHE = {}
HOST_HEALTHY_CACHE = {} HOST_HEALTHY_CACHE = {}
HOSTS_PATH = ENV['DISCOURSE_DNS_CACHE_HOSTS_FILE'] || "/etc/hosts" HOSTS_PATH = ENV['DISCOURSE_DNS_CACHE_HOSTS_FILE'] || "/etc/hosts"
@ -171,15 +174,15 @@ HEALTH_CHECKS = {
"DISCOURSE_DB_HOST": lambda { |addr| "DISCOURSE_DB_HOST": lambda { |addr|
postgres_healthcheck( postgres_healthcheck(
host: addr, host: addr,
user: ENV["DISCOURSE_DB_USER_NAME"], user: ENV["DISCOURSE_DB_USER_NAME"] || DEFAULT_DB_NAME,
password: ENV["DISCOURSE_DB_PASSWORD"], dbname: ENV["DISCOURSE_DB_NAME"] || DEFAULT_DB_NAME,
dbname: ENV["DISCOURSE_DB_NAME"])}, password: ENV["DISCOURSE_DB_PASSWORD"])},
"DISCOURSE_DB_REPLICA_HOST": lambda { |addr| "DISCOURSE_DB_REPLICA_HOST": lambda { |addr|
postgres_healthcheck( postgres_healthcheck(
host: addr, host: addr,
user: ENV["DISCOURSE_DB_USER_NAME"], user: ENV["DISCOURSE_DB_USER_NAME"] || DEFAULT_DB_NAME,
password: ENV["DISCOURSE_DB_PASSWORD"], dbname: ENV["DISCOURSE_DB_NAME"] || DEFAULT_DB_NAME,
dbname: ENV["DISCOURSE_DB_NAME"])}, password: ENV["DISCOURSE_DB_PASSWORD"])},
"DISCOURSE_REDIS_HOST": lambda { |addr| "DISCOURSE_REDIS_HOST": lambda { |addr|
redis_healthcheck( redis_healthcheck(
host: addr, host: addr,