X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fserver_event.lua;fp=net%2Fserver_event.lua;h=8d6f5597b945d91eaed1d742afdcc58caf0528b0;hb=2fa44aa5d12c8e558544e86c163290e6560230ee;hp=dbf5161f133920c41b40e1a3e0b0817d0d2f8816;hpb=4342326916bf4d13dd4185229403ecf1f80cbe4c;p=prosody.git

diff --git a/net/server_event.lua b/net/server_event.lua
index dbf5161f..8d6f5597 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -343,24 +343,11 @@ do
 				return nil, "writebuffer not empty, waiting"
 			end
 		else
-			debug( "try to close server with id:", self.id, "args:", now )
+			debug( "try to close server with id:", tostring(self.id), "args:", tostring(now) )
 			self.fatalerror = "server to close"
 			self:_lock( true )
-			local count = 0
-			for _, item in ipairs( interfacelist( ) ) do
-				if ( item.type ~= "server" ) and ( item._server == self ) then  -- client/server match
-					if item:close( now ) then  -- writebuffer was empty
-						count = count + 1
-					end
-				end
-			end
-			local timeout = 0  -- dont wait for unfinished writebuffers of clients...
-			if not now then
-				timeout = cfg.WRITE_TIMEOUT  -- ...or wait for it
-			end
-			self:_close( timeout )  -- add new event to remove the server interface
-			debug( "seconds remained until server is closed:", timeout )
-			return count  -- returns finished clients with empty writebuffer
+			self:_close( 0 )  -- add new event to remove the server interface
+			return true
 		end
 	end