prosody
2f9687c09e6e

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

9301:2f9687c09e6e

net.server_epoll: Remove coercion of connections to strings No longer needed since util.logger does this now
author Kim Alvefur <zash@zash.se>
date Thu, 13 Sep 2018 17:02:26 +0200
parents 9300:1df8832bd29e
children 9302:57f8e41255fb
files net/server_epoll.lua
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/net/server_epoll.lua	Thu Sep 13 16:50:23 2018 +0200
+++ b/net/server_epoll.lua	Thu Sep 13 17:02:26 2018 +0200
@@ -390,10 +390,10 @@
 	if self.writebuffer and self.writebuffer[1] then
 		self:setflags(false, true); -- Flush final buffer contents
 		self.write, self.send = noop, noop; -- No more writing
-		log("debug", "Close %s after writing", tostring(self));
+		log("debug", "Close %s after writing", self);
 		self.ondrain = interface.close;
 	else
-		log("debug", "Close %s now", tostring(self));
+		log("debug", "Close %s now", self);
 		self.write, self.send = noop, noop;
 		self.close = noop;
 		self:on("disconnect");
@@ -421,12 +421,12 @@
 function interface:starttls(tls_ctx)
 	if tls_ctx then self.tls_ctx = tls_ctx; end
 	if self.writebuffer and self.writebuffer[1] then
-		log("debug", "Start TLS on %s after write", tostring(self));
+		log("debug", "Start TLS on %s after write", self);
 		self.ondrain = interface.starttls;
 		self.starttls = false;
 		self:setflags(nil, true); -- make sure wantwrite is set
 	else
-		log("debug", "Start TLS on %s now", tostring(self));
+		log("debug", "Start TLS on %s now", self);
 		self:setflags(false, false);
 		local conn, err = luasec.wrap(self.conn, tls_ctx or self.tls_ctx);
 		if not conn then
@@ -449,22 +449,22 @@
 	self:setreadtimeout(false);
 	local ok, err = self.conn:dohandshake();
 	if ok then
-		log("debug", "TLS handshake on %s complete", tostring(self));
+		log("debug", "TLS handshake on %s complete", self);
 		self.onwritable = nil;
 		self.onreadable = nil;
 		self._tls = true;
 		self:on("status", "ssl-handshake-complete");
 		self:init();
 	elseif err == "wantread" then
-		log("debug", "TLS handshake on %s to wait until readable", tostring(self));
+		log("debug", "TLS handshake on %s to wait until readable", self);
 		self:setflags(true, false);
 		self:setreadtimeout(cfg.handshake_timeout);
 	elseif err == "wantwrite" then
-		log("debug", "TLS handshake on %s to wait until writable", tostring(self));
+		log("debug", "TLS handshake on %s to wait until writable", self);
 		self:setflags(false, true);
 		self:setwritetimeout(cfg.handshake_timeout);
 	else
-		log("debug", "TLS handshake error on %s: %s", tostring(self), err);
+		log("debug", "TLS handshake error on %s: %s", self, err);
 		self:on("disconnect", err);
 		self:destroy();
 	end