Diff

net/server_epoll.lua @ 10420:49a828819696

net.server_epoll: Save log tag in a field on FD watchers too As with 0e1701197722
author Kim Alvefur <zash@zash.se>
date Sun, 17 Nov 2019 23:47:31 +0100
parent 10419:3b9d17c234df
child 10486:479e96e554c8
line wrap: on
line diff
--- a/net/server_epoll.lua	Sun Nov 17 23:45:44 2019 +0100
+++ b/net/server_epoll.lua	Sun Nov 17 23:47:31 2019 +0100
@@ -802,7 +802,8 @@
 		end;
 		-- Otherwise it'll need to be something LuaSocket-compatible
 	end
-	conn.log = logger.init(("fdwatch%s"):format(new_id()));
+	conn.id = new_id();
+	conn.log = logger.init(("fdwatch%s"):format(conn.id));
 	conn:add(onreadable, onwritable);
 	return conn;
 end;
@@ -911,7 +912,8 @@
 				fds[fd] = nil;
 			end;
 		}, interface_mt);
-		conn.log = logger.init(("fdwatch%d"):format(conn:getfd()));
+		conn.id = conn:getfd();
+		conn.log = logger.init(("fdwatch%d"):format(conn.id));
 		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;