diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-24 21:59:20 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-24 21:59:20 +0100 |
| commit | 8f062c3d98b1e3c6a5b56cdb5ad4ea0a326a513d (patch) | |
| tree | fe8c013599dd847f7365cb1adab80ab8fe846de5 /net/server_event.lua | |
| parent | fc3a3c0b0c3a37017bc500e58b8dbdd4b39627c9 (diff) | |
| parent | b23e6a2ef012c2d2568766ef0f41aaadf3cac826 (diff) | |
| download | prosody-8f062c3d98b1e3c6a5b56cdb5ad4ea0a326a513d.tar.gz prosody-8f062c3d98b1e3c6a5b56cdb5ad4ea0a326a513d.zip | |
Merge timber->trunk - thanks everyone!
Diffstat (limited to 'net/server_event.lua')
| -rw-r--r-- | net/server_event.lua | 19 |
1 files changed, 3 insertions, 16 deletions
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 |