lib/strong_actions/config.rb in strong_actions-0.0.8 vs lib/strong_actions/config.rb in strong_actions-0.0.9

@@ -5,10 +5,11 @@
   class Config
     include Singleton
 
     def initialize
       @config_files ||= ['config/acl.yml']
+      @mutex  = Mutex.new
     end
 
     def config_files
       @config_files
     end
@@ -26,20 +27,34 @@
     end
 
     private
 
     def definitions
-      if @acl.nil? or Rails.env.development?
-        @acl = {}
-        config_files.each do |config_file|
-          yml = YAML.load_file(config_file)
-          yml.each do |role, values|
-            raise "role #{role} is already defined." if @acl.has_key?(role)
-            @acl[role] = values
+      if should_load?
+        with_mutex do
+          if should_load?
+            @acl = {}
+            config_files.each do |config_file|
+              yml = YAML.load_file(config_file)
+              yml.each do |role, values|
+                raise "role #{role} is defined multiple times. config files are [#{config_files.join(', ')}]" if @acl.has_key?(role)
+                @acl[role] = values
+              end
+            end
           end
         end
       end
       @acl
+    end
+
+    def should_load?
+      @acl.nil? or Rails.env.development?
+    end
+      
+    def with_mutex
+      @mutex.synchronize do
+        yield
+      end
     end
 
   end
 end
\ No newline at end of file