nonnative 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3015cc7b1f784a45dbb77184fd73e67e6cf33ff9d7bb97d09ebd01f1359d85b9
-  data.tar.gz: 9bf8f2fc9bb72f8de89e76f44912d62e8a7cd19ccb533c7930600fbc70411b28
+  metadata.gz: 522cec08aee3855943f6ef6ba38bec3d85acd00aeeb2d6640a6869cf55014518
+  data.tar.gz: ebebc8d342a2111f8fb8538c0bf5b615c549b61127761c3e2ada47397294b47c
 SHA512:
-  metadata.gz: 73147dafad8a271673d070f033a1a3f92270994b0593bb7f391d0ae126ed0e34005cfd22af9e01052846bd757b866fba9db4d36a3468219be54208e8121a5f80
-  data.tar.gz: ad58bc0015ccdf3f91f9ffbb5ca12de3bd9650d540ef33ec982df353abd6892c496328815f60991e340721971e1bfbf86a663292337a755280d1157c2ff9d5be
+  metadata.gz: e4df243398b167fb955324fe12894f8bb5ecaf4ec612f8c55ad73e6cf95d6e04868ad1ee2ff64c1fbbc68322ea96dc953a0329b01f609a31b5409fb38542f09a
+  data.tar.gz: 419ca92810588c41e281cd4d77e49651bee8c412d7285689f196c176473364f1562eabbe1944a121e238e79c9cfb0de6335bbcde05b6e068478c45db4414cef2

data/.circleci/config.yml

@@ -35,7 +35,7 @@ jobs:
     resource_class: arm.large
   sync:
     docker:
-      - image: alexfalkowski/release:8.14
+      - image: alexfalkowski/release:8.15
     working_directory: ~/nonnative
     steps:
       - checkout:
@@ -46,7 +46,7 @@ jobs:
     resource_class: arm.large
   version:
     docker:
-      - image: alexfalkowski/release:8.14
+      - image: alexfalkowski/release:8.15
     working_directory: ~/nonnative
     steps:
       - checkout:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (3.2.0)
+    nonnative (3.2.1)
       concurrent-ruby (>= 1, < 2)
       config (>= 5, < 6)
       cucumber (>= 7, < 12)

data/lib/nonnative/fault_injection_proxy.rb

@@ -77,18 +77,17 @@ module Nonnative
     #
     # @return [void]
     def stop
-      mutex.synchronize do
-        close_connections
-      end
-
-      server = @tcp_server
-      @tcp_server = nil
+      server = tcp_server
       server&.close
 
-      listener_thread = @thread
-      @thread = nil
+      listener_thread = thread
       listener_thread&.join
 
+      @tcp_server = nil
+      @thread = nil
+
+      close_connections
+
       Nonnative.logger.info "stopped with host '#{service.host}' and port '#{service.port}' for proxy 'fault_injection'"
     end
 
@@ -162,7 +161,7 @@ module Nonnative
         logger.info "handled connection for '#{id}' with socket '#{socket.inspect}'"
       end
 
-      connections.delete(id)
+      delete_connection(id)
     end
 
     def connect(id, socket)
@@ -179,24 +178,26 @@ module Nonnative
     end
 
     def close_connections
-      connections.each do |id, connection|
+      active_connections = mutex.synchronize do
+        connections.to_a.tap { connections.clear }
+      end
+
+      active_connections.each do |id, connection|
         close_connection(id, connection)
       end
-    ensure
-      connections.clear
     end
 
     def apply_state(state)
-      mutex.synchronize do
-        Nonnative.logger.info "applying state '#{state}' for proxy 'fault_injection'"
+      Nonnative.logger.info "applying state '#{state}' for proxy 'fault_injection'"
 
+      mutex.synchronize do
         return if @state == state
 
         @state = state
-        close_connections
-
-        wait
       end
+
+      close_connections
+      wait
     end
 
     def read_state
@@ -204,15 +205,19 @@ module Nonnative
     end
 
     def register_connection(id, socket)
-      connections[id] = Connection.new(socket)
+      mutex.synchronize { connections[id] = Connection.new(socket) }
     end
 
     def attach_connection_thread(id, thread)
-      connections[id]&.thread = thread
+      mutex.synchronize { connections[id]&.thread = thread }
     end
 
     def attach_connection_pair(id, pair)
-      connections[id]&.pair = pair
+      mutex.synchronize { connections[id]&.pair = pair }
+    end
+
+    def delete_connection(id)
+      mutex.synchronize { connections.delete(id) }
     end
 
     def close_connection(id, connection)

data/lib/nonnative/version.rb

@@ -4,5 +4,5 @@ module Nonnative
   # The current gem version.
   #
   # @return [String]
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Alejandro Falkowski