From c7acdd3ccae623cd5986d21aa9a2363268379f12 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Mon, 16 Feb 2015 20:29:41 +0300
Subject: [PATCH] console.lua: (silent termination) post-merge fixes
---
src/lua/bsdsocket.lua | 12 ++++++------
src/lua/console.lua | 1 -
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/lua/bsdsocket.lua b/src/lua/bsdsocket.lua
index 1c26456730..d0f7d3eec7 100644
--- a/src/lua/bsdsocket.lua
+++ b/src/lua/bsdsocket.lua
@@ -513,16 +513,16 @@ socket_methods.accept = function(self)
end
local c = bless_socket(cfd)
if c == nil then
- self._errno = box.errno()
+ self._errno = boxerrno()
return nil
end
return c, from
end
local errno_is_transient = {
- [box.errno.EAGAIN] = true;
- [box.errno.EWOULDBLOCK] = true;
- [box.errno.EINTR] = true;
+ [boxerrno.EAGAIN] = true;
+ [boxerrno.EWOULDBLOCK] = true;
+ [boxerrno.EINTR] = true;
}
local function readchunk(self, size, timeout)
@@ -561,7 +561,7 @@ local function readchunk(self, size, timeout)
return data
end
elseif not errno_is_transient[self:errno()] then
- self._errno = box.errno()
+ self._errno = boxerrno()
return nil
end
end
@@ -646,7 +646,7 @@ local function readline(self, limit, eol, timeout)
end
elseif not error_is_transient[self:errno()] then
- self._errno = box.errno()
+ self._errno = boxerrno()
return nil
end
end
diff --git a/src/lua/console.lua b/src/lua/console.lua
index 4eda8b0e5c..2416556319 100644
--- a/src/lua/console.lua
+++ b/src/lua/console.lua
@@ -327,7 +327,6 @@ local function listen(uri)
error(string.format('failed to create server %s:%s: %s',
host, port, errno.strerror()))
end
- log.info("started on %s:%s", addr.host, addr.port)
return s
end
--
GitLab