* Fix opening and closing Redis connections instead of using a pool * Fix Redis connections not being returned to the pool in CLI commands
		
			
				
	
	
		
			30 lines
		
	
	
	
		
			530 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			30 lines
		
	
	
	
		
			530 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| class Mastodon::RackMiddleware
 | |
|   def initialize(app)
 | |
|     @app = app
 | |
|   end
 | |
| 
 | |
|   def call(env)
 | |
|     @app.call(env)
 | |
|   ensure
 | |
|     clean_up_sockets!
 | |
|   end
 | |
| 
 | |
|   private
 | |
| 
 | |
|   def clean_up_sockets!
 | |
|     clean_up_redis_socket!
 | |
|     clean_up_statsd_socket!
 | |
|   end
 | |
| 
 | |
|   def clean_up_redis_socket!
 | |
|     RedisConfiguration.pool.checkin if Thread.current[:redis]
 | |
|     Thread.current[:redis] = nil
 | |
|   end
 | |
| 
 | |
|   def clean_up_statsd_socket!
 | |
|     Thread.current[:statsd_socket]&.close
 | |
|     Thread.current[:statsd_socket] = nil
 | |
|   end
 | |
| end
 |