Fix usage of Mutex

hanami · May 7, 2016 · a4ad9c8 · a4ad9c8
1 parent 29d83be
commit a4ad9c8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/lib/hanami/application.rb b/lib/hanami/application.rb
@@ -122,6 +122,13 @@ def middleware
     end
 
     class << self
+      # @since 0.8.0
+      # @api private
+      @@mutex = Mutex.new
+
+      # @since 0.2.0
+      # @api private
+      @@applications = Set.new
 
       # Registry of Hanami applications in the current Ruby process
       #
@@ -130,9 +137,7 @@ class << self
       # @since 0.2.0
       # @api private
       def applications
-        synchronize do
-          @@applications ||= Set.new
-        end
+        @@applications
       end
 
       # Configure the application.
@@ -238,7 +243,7 @@ def preload_applications!
       # @since 0.2.0
       # @api private
       def synchronize
-        Mutex.new.synchronize do
+        @@mutex.synchronize do
           yield
         end
       end

diff --git a/lib/hanami/container.rb b/lib/hanami/container.rb
@@ -17,17 +17,19 @@ def hanami_app?(app)
       end
     end
 
+    @@mutex = Mutex.new
+
     attr_reader :routes
 
     def self.configure(options = {}, &blk)
-      Mutex.new.synchronize do
+      @@mutex.synchronize do
         @@options       = options
         @@configuration = blk
       end
     end
 
     def initialize
-      Mutex.new.synchronize do
+      @@mutex.synchronize do
         assert_configuration_presence!
         prepare_middleware_stack!
       end

diff --git a/lib/hanami/environment.rb b/lib/hanami/environment.rb
@@ -14,6 +14,12 @@ module Hanami
   # @since 0.1.0
   # @api private
   class Environment
+    # Global lock (used to serialize process of environment configuration)
+    #
+    # @since 0.8.0
+    # @api private
+    @@mutex = Mutex.new
+
     # Standard Rack ENV key
     #
     # @since 0.1.0
@@ -192,8 +198,7 @@ class Environment
     def initialize(options = {})
       @options = Hanami::Hanamirc.new(root).options
       @options.merge! Utils::Hash.new(options.clone).symbolize!
-      @mutex   = Mutex.new
-      @mutex.synchronize { set_env_vars! }
+      @@mutex.synchronize { set_env_vars! }
     end
 
     # The current environment

diff --git a/lib/hanami/loader.rb b/lib/hanami/loader.rb
@@ -13,19 +13,18 @@ module Hanami
   # @since 0.1.0
   # @api private
   class Loader
+    @@mutex = Mutex.new
 
     STRICT_TRANSPORT_SECURITY_HEADER = 'Strict-Transport-Security'.freeze
     STRICT_TRANSPORT_SECURITY_DEFAULT_VALUE = 'max-age=31536000'.freeze
 
     def initialize(application)
       @application   = application
       @configuration = @application.configuration
-
-      @mutex = Mutex.new
     end
 
     def load!
-      @mutex.synchronize do
+      @@mutex.synchronize do
         load_configuration!
         configure_frameworks!
         load_configuration_load_paths!