mirror of
				https://github.com/discourse/discourse.git
				synced 2025-02-25 18:55:32 -06:00 
			
		
		
		
	FIX: Set PG connect_timeout to 5 seconds.
				
					
				
			* 30 seconds is alittle too long.
This commit is contained in:
		@@ -92,7 +92,7 @@ class GlobalSetting
 | 
			
		||||
 | 
			
		||||
  def self.database_config
 | 
			
		||||
    hash = { "adapter" => "postgresql" }
 | 
			
		||||
    %w{pool timeout socket host port username password replica_host replica_port}.each do |s|
 | 
			
		||||
    %w{pool connect_timeout timeout socket host port username password replica_host replica_port}.each do |s|
 | 
			
		||||
      if val = self.send("db_#{s}")
 | 
			
		||||
        hash[s] = val
 | 
			
		||||
      end
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user