lib/fluent/plugin/input_session.rb in fluent-plugin-secure-forward-0.3.4 vs lib/fluent/plugin/input_session.rb in fluent-plugin-secure-forward-0.3.5pre1

@@ -194,25 +194,26 @@
       end
     end
   rescue Errno::ECONNRESET => e
     # disconnected from client
   rescue => e
-    log.warn "unexpected error in in_secure_forward", error_class: e.class, error: e
+    log.warn "unexpected error in in_secure_forward from #{host}:#{port}", error_class: e.class, error: e
   ensure
+    log.debug "Shutting down #{host}:#{port}"
     self.shutdown
   end
 
   def shutdown
     @state = :closed
+    log.debug "Shutdown called"
+    @socket.close
     if @thread == Thread.current
-      @socket.close
       @thread.kill
     else
       if @thread
         @thread.kill
         @thread.join
       end
-      @socket.close
     end
   rescue => e
     log.debug "#{e.class}:#{e.message}"
   end
 end