From b6c208cf51cc4ec3965d1d0d736739c3b0548a7a Mon Sep 17 00:00:00 2001
From: Cloud Wu <cloudwu@gmail.com>
Date: Tue, 22 Apr 2014 16:18:49 +0800
Subject: [PATCH] try connect only once at first time

---
 examples/main.lua        |  1 -
 lualib/mongo.lua         |  2 +-
 lualib/redis.lua         |  8 ++++----
 lualib/socketchannel.lua | 16 +++++++++-------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/examples/main.lua b/examples/main.lua
index e95f05c2..8c459ef6 100644
--- a/examples/main.lua
+++ b/examples/main.lua
@@ -6,7 +6,6 @@ skynet.start(function()
 	print("Server start")
 	local service = skynet.newservice("service_mgr")
 	skynet.monitor "simplemonitor"
-	local lualog = skynet.newservice("lualog")
 	local console = skynet.newservice("console")
 --	skynet.newservice("debug_console",8000)
 	skynet.newservice("simpledb")
diff --git a/lualib/mongo.lua b/lualib/mongo.lua
index 6e2f784e..56c134a8 100644
--- a/lualib/mongo.lua
+++ b/lualib/mongo.lua
@@ -103,7 +103,7 @@ function mongo.client( conf )
 		auth = mongo_auth(conf),
 	}
 	setmetatable(obj, client_meta)
-	obj.__sock:connect()
+	obj.__sock:connect(true)	-- try connect only once
 	return obj
 end
 
diff --git a/lualib/redis.lua b/lualib/redis.lua
index 1fd5b921..5e41b914 100644
--- a/lualib/redis.lua
+++ b/lualib/redis.lua
@@ -86,8 +86,8 @@ function redis.connect(db_conf)
 		port = db_conf.port or 6379,
 		auth = redis_login(db_conf.auth, db_conf.db),
 	}
-	-- try connect first
-	channel:connect()
+	-- try connect first only once
+	channel:connect(true)
 	return setmetatable( { channel }, meta )
 end
 
@@ -178,8 +178,8 @@ function redis.watch(db_conf)
 	}
 	obj.__sock = channel
 
-	-- try connect first
-	channel:connect()
+	-- try connect first only once
+	channel:connect(true)
 	return setmetatable( obj, watchmeta )
 end
 
diff --git a/lualib/socketchannel.lua b/lualib/socketchannel.lua
index 974d6dae..48b6d4fc 100644
--- a/lualib/socketchannel.lua
+++ b/lualib/socketchannel.lua
@@ -146,11 +146,13 @@ local function connect_once(self)
 	return true
 end
 
-local function try_connect(self)
+local function try_connect(self , once)
 	local t = 100
 	while not self.__closed do
 		if connect_once(self) then
 			return
+		elseif once then
+			error(string.format("Connect to %s:%d failed", self.__host, self.__port))
 		end
 		if t > 1000 then
 			print("socket: try to reconnect", self.__host, self.__port)
@@ -163,7 +165,7 @@ local function try_connect(self)
 	end
 end
 
-local function block_connect(self)
+local function block_connect(self, once)
 	if self.__sock then
 		local authco = self.__authcoroutine
 		if not authco then
@@ -183,11 +185,11 @@ local function block_connect(self)
 		table.insert(self.__connecting, co)
 		skynet.wait()
 		-- check connection again
-		return block_connect(self)
+		return block_connect(self, once)
 	end
 
 	self.__connecting[1] = true
-	try_connect(self)
+	try_connect(self, once)
 	self.__connecting[1] = nil
 	for i=2, #self.__connecting do
 		local co = self.__connecting[i]
@@ -196,15 +198,15 @@ local function block_connect(self)
 	end
 
 	-- check again
-	return block_connect(self)
+	return block_connect(self, once)
 end
 
-function channel:connect()
+function channel:connect(once)
 	if self.__closed then
 		self.__closed = false
 	end
 
-	return block_connect(self)
+	return block_connect(self, once)
 end
 
 function channel:request(request, response)