Merge 0.10->trunk

[prosody.git] / net / server_select.lua

diff --git a/net/server_select.lua b/net/server_select.lua
index cf55be5d2f440349ab706dd05c7027ebcc687ceb..4df6e12d750ce2ce15ef6a719e4308792a5ac2f8 100644 (file)
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -31,7 +31,6 @@ local tostring = use "tostring"
 
 --// lua libs //--
 
-local os = use "os"
 local table = use "table"
 local string = use "string"
 local coroutine = use "coroutine"
@@ -57,7 +56,6 @@ local getaddrinfo = luasocket.dns.getaddrinfo
 
 local ssl_wrap = ( has_luasec and luasec.wrap )
 local socket_bind = luasocket.bind
-local socket_sleep = luasocket.sleep
 local socket_select = luasocket.select
 
 --// functions //--
@@ -101,7 +99,6 @@ local _sendtraffic
 local _readtraffic
 
 local _selecttimeout
-local _sleeptime
 local _tcpbacklog
 
 local _starttime
@@ -138,7 +135,6 @@ _sendtraffic = 0 -- some stats
 _readtraffic = 0
 
 _selecttimeout = 1 -- timeout of socket.select
-_sleeptime = 0 -- time to wait at the end of every loop
 _tcpbacklog = 128 -- some kind of hint to the OS
 
 _maxsendlen = 51000 * 1024 -- max len of send buffer
@@ -290,7 +286,6 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
        local bufferqueuelen = 0        -- end of buffer array
 
        local toclose
-       local fatalerror
        local needtls
 
        local bufferlen = 0
@@ -502,7 +497,6 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                        return dispatch( handler, buffer, err )
                else    -- connections was closed or fatal error
                        out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " read error: ", tostring(err) )
-                       fatalerror = true
                        _ = handler and handler:force_close( err )
                        return false
                end
@@ -542,7 +536,6 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                        return true
                else    -- connection was closed during sending or fatal error
                        out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " write error: ", tostring(err) )
-                       fatalerror = true
                        _ = handler and handler:force_close( err )
                        return false
                end
@@ -587,8 +580,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                                                coroutine_yield( ) -- handshake not finished
                                        end
                                end
-                               out_put( "server.lua: ssl handshake error: ", tostring(err or "handshake too long") )
-                               _ = handler and handler:force_close("ssl handshake failed")
+                               err = "ssl handshake error: " .. ( err or "handshake too long" );
+                               out_put( "server.lua: ", err );
+                               _ = handler and handler:force_close(err)
                                return false, err -- handshake failed
                        end
                )
@@ -790,7 +784,6 @@ end
 getsettings = function( )
        return {
                select_timeout = _selecttimeout;
-               select_sleep_time = _sleeptime;
                tcp_backlog = _tcpbacklog;
                max_send_buffer_size = _maxsendlen;
                max_receive_buffer_size = _maxreadlen;
@@ -808,7 +801,6 @@ changesettings = function( new )
                return nil, "invalid settings table"
        end
        _selecttimeout = tonumber( new.select_timeout ) or _selecttimeout
-       _sleeptime = tonumber( new.select_sleep_time ) or _sleeptime
        _maxsendlen = tonumber( new.max_send_buffer_size ) or _maxsendlen
        _maxreadlen = tonumber( new.max_receive_buffer_size ) or _maxreadlen
        _checkinterval = tonumber( new.select_idle_check_interval ) or _checkinterval
@@ -941,11 +933,9 @@ loop = function(once) -- this is the main loop of the program
                                end
                        end
                end
-
-               -- wait some time (0 by default)
-               socket_sleep( _sleeptime )
        until quitting;
        if once and quitting == "once" then quitting = nil; return; end
+       closeall();
        return "quitting"
 end
 
@@ -1019,8 +1009,6 @@ local addclient = function( address, port, listeners, pattern, sslctx, typ )
        end
 end
 
---// EXPERIMENTAL //--
-
 ----------------------------------// BEGIN //--
 
 use "setmetatable" ( _socketlist, { __mode = "k" } )