From 11b447e1ecf982c85ee312d4794f204fd47476b7 Mon Sep 17 00:00:00 2001
From: wuxiaoyi <850263594@qq.com>
Date: Wed, 7 Dec 2016 11:38:29 +0800
Subject: [PATCH 1/3] bugfix/start_thread_pool_server undefined Setting error

---
 lib/sails/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sails/base.rb b/lib/sails/base.rb
index f44c0b7..cf73f7c 100644
--- a/lib/sails/base.rb
+++ b/lib/sails/base.rb
@@ -207,7 +207,7 @@ def start_thread_pool_server!
       @server = ::Thrift::ThreadPoolServer.new(processor, transport, transport_factory, protocol_factory, config.thread_size)
 
       logger.info "Boot on: #{Sails.root}"
-      logger.info "[#{Time.now}] Starting the Sails with ThreadPool size: #{Setting.pool_size}..."
+      logger.info "[#{Time.now}] Starting the Sails with ThreadPool size: #{config.thread_size}..."
       logger.info "serve: 127.0.0.1:#{config.thread_port}"
 
       begin

From 756caa8dde8e5f4233352f19562fa2d266c5cf6a Mon Sep 17 00:00:00 2001
From: wuxiaoyi <850263594@qq.com>
Date: Wed, 7 Dec 2016 11:39:58 +0800
Subject: [PATCH 2/3] change version

---
 CHANGELOG.md         | 4 ++++
 lib/sails/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9017b6..3597701 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.4
+
+- fix start_thread_pool_server undefined Setting error
+
 ## 0.2.3
 
 - clear service instance params before set
diff --git a/lib/sails/version.rb b/lib/sails/version.rb
index 316e451..02330d3 100644
--- a/lib/sails/version.rb
+++ b/lib/sails/version.rb
@@ -1,5 +1,5 @@
 module Sails
   def self.version
-    "0.2.3"
+    "0.2.4"
   end
 end

From b1c72c2d81147520dfba047fc5d96bd5655f5dc5 Mon Sep 17 00:00:00 2001
From: wuxiaoyi <850263594@qq.com>
Date: Wed, 7 Dec 2016 13:00:41 +0800
Subject: [PATCH 3/3] fix test

---
 Gemfile.lock | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 47895d3..2975dc3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sails (0.2.3)
+    sails (0.2.4)
       activesupport (> 3.2.0)
       thor
       thrift (>= 0.9.0)
@@ -9,17 +9,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    concurrent-ruby (1.0.2)
     dalli (2.7.1)
     diff-lcs (1.2.5)
     i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.9.1)
+    minitest (5.10.1)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -32,7 +31,7 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
     thrift (0.9.3.0)
     tzinfo (1.2.2)