Merge branch 'master' into docs-overhaul

shakacode · Apr 23, 2016 · de2384c · de2384c
2 parents 37e5437 + 549f2d1
commit de2384c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/react_on_rails/server_rendering_pool.rb b/lib/react_on_rails/server_rendering_pool.rb
@@ -7,7 +7,7 @@ module ReactOnRails
   class ServerRenderingPool
     def self.reset_pool
       options = { size: ReactOnRails.configuration.server_renderer_pool_size,
-                  timeout: ReactOnRails.configuration.server_renderer_pool_size }
+                  timeout: ReactOnRails.configuration.server_renderer_timeout }
       @js_context_pool = ConnectionPool.new(options) { create_js_context }
     end