# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1574030744 -3600
# Node ID 3b9d17c234dfe1e435e16ab4c7726459e32ce54f
# Parent  c8aa665950728161c57aff6fadc42fbfe2606239
Back out c8aa66595072: Extra changes accidentally included

diff -r c8aa66595072 -r 3b9d17c234df net/server_epoll.lua
--- a/net/server_epoll.lua	Sun Nov 17 23:27:48 2019 +0100
+++ b/net/server_epoll.lua	Sun Nov 17 23:45:44 2019 +0100
@@ -383,7 +383,7 @@
 		end
 		if err ~= "timeout" then
 			self:on("disconnect", err);
-			self:close()
+			self:destroy()
 			return;
 		end
 	end
@@ -802,8 +802,7 @@
 		end;
 		-- Otherwise it'll need to be something LuaSocket-compatible
 	end
-	conn.id = new_id();
-	conn.log = logger.init(("fdwatch%s"):format(conn.id));
+	conn.log = logger.init(("fdwatch%s"):format(new_id()));
 	conn:add(onreadable, onwritable);
 	return conn;
 end;
@@ -912,8 +911,7 @@
 				fds[fd] = nil;
 			end;
 		}, interface_mt);
-		conn.id = conn:getfd();
-		conn.log = logger.init(("fdwatch%d"):format(conn.id));
+		conn.log = logger.init(("fdwatch%d"):format(conn:getfd()));
 		local ok, err = conn:add(mode == "r" or mode == "rw", mode == "w" or mode == "rw");
 		if not ok then return ok, err; end
 		return conn;