Merge pull request #585 from SPBTV/thread-safety

Fix after boot thread-safety issue

Author: dblock

CHANGELOG.md

@@ -31,7 +31,7 @@ Next Release
 * [#538](https://github.com/intridea/grape/pull/538): Fixed default values for grouped params - [@dm1try](https://github.com/dm1try).
 * [#549](https://github.com/intridea/grape/pull/549): Fixed handling of invalid version headers to return 406 if a header cannot be parsed - [@bwalex](https://github.com/bwalex).
 * [#557](https://github.com/intridea/grape/pull/557): Pass `content_types` option to `Grape::Middleware::Error` to fix the content-type header for custom formats. - [@bernd](https://github.com/bernd).
-
+* [#585](https://github.com/intridea/grape/pull/585): Fix after boot thread-safety issue - [@etehtsea](https://github.com/etehtsea).
 
 0.6.1 (10/19/2013)
 ==================

lib/grape.rb

@@ -17,6 +17,7 @@
 require 'multi_xml'
 require 'virtus'
 require 'i18n'
+require 'thread'
 
 I18n.load_path << File.expand_path('../grape/locale/en.yml', __FILE__)
 

lib/grape/api.rb

@@ -9,6 +9,8 @@ class << self
       attr_reader :endpoints, :instance, :routes, :route_set, :settings, :versions
       attr_writer :logger
 
+      LOCK = Mutex.new
+
       def logger(logger = nil)
         if logger
           @logger = logger
@@ -26,15 +28,15 @@ def reset!
       end
 
       def compile
-        @instance = new
+        @instance ||= new
       end
 
       def change!
         @instance = nil
       end
 
       def call(env)
-        compile unless instance
+        LOCK.synchronize { compile } unless instance
         call!(env)
       end