FIX: Scan files when a single server is online

lib/discourse_antivirus/clamav.rb

@@ -41,19 +41,11 @@ def update_versions
     end
 
     def accepting_connections?
-      sockets = clamav_services_pool.all_tcp_sockets
+      available = clamav_services_pool.all_tcp_sockets.any? { |socket| target_online?(socket) }
 
-      if sockets.empty?
-        update_status(true)
-        return false
-      end
-
-      available = sockets.reduce(true) { |memo, socket| memo && target_online?(socket) }
+      update_status(!available)
 
-      available.tap do |status|
-        unavailable = !status
-        update_status(unavailable)
-      end
+      available
     end
 
     def scan_upload(upload)
@@ -101,7 +93,10 @@ def clean_msg(raw)
       raw.gsub("1: ", "").strip
     end
 
-    def with_session(socket: clamav_services_pool.tcp_socket)
+    def with_session(socket: nil)
+      socket ||= clamav_services_pool.all_tcp_sockets.shuffle.find { |s| target_online?(s) }
+      raise "no online socket found" if !socket
+
       write_in_socket(socket, "zIDSESSION\0")
 
       yield(socket)

lib/discourse_antivirus/clamav_services_pool.rb

@@ -14,10 +14,6 @@ def self.correctly_configured?
       end
     end
 
-    def tcp_socket
-      build_socket(service_instance.targets.first)
-    end
-
     def all_tcp_sockets
       service_instance.targets.map { |target| build_socket(target) }
     end