Merge pull request #245 from DavidFeng/patch-1

remove redundant print and use skynet.error
This commit is contained in:
云风
2015-03-04 16:43:49 +08:00
3 changed files with 7 additions and 8 deletions

View File

@@ -28,9 +28,9 @@ Run these in different console
## About Lua
Skynet now use lua 5.3.0 final, http://www.lua.org/ftp/lua-5.3.0.tar.gz
Skynet now use Lua 5.3.0 final, http://www.lua.org/ftp/lua-5.3.0.tar.gz
You can also use the other offical lua version , edit the makefile by yourself .
You can also use the other official Lua version , edit the makefile by yourself .
## How To (in Chinese)

View File

@@ -16,7 +16,7 @@ struct snlua {
const char * preload;
};
static int
static int
traceback (lua_State *L) {
const char *msg = lua_tostring(L, 1);
if (msg)
@@ -191,7 +191,7 @@ _send(lua_State *L) {
}
if (session < 0) {
// send to invalid address
// todo: maybe throw error whould be better
// todo: maybe throw an error would be better
return 0;
}
lua_pushinteger(L,session);
@@ -304,7 +304,7 @@ ltrash(lua_State *L) {
int
luaopen_skynet_core(lua_State *L) {
luaL_checkversion(L);
luaL_Reg l[] = {
{ "send" , _send },
{ "genid", _genid },

View File

@@ -22,7 +22,7 @@ local skynet = {
PTYPE_HARBOR = 5,
PTYPE_SOCKET = 6,
PTYPE_ERROR = 7,
PTYPE_QUEUE = 8, -- use in deprecated mqueue, use skynet.queue instead
PTYPE_QUEUE = 8, -- used in deprecated mqueue, use skynet.queue instead
PTYPE_DEBUG = 9,
PTYPE_LUA = 10,
PTYPE_SNAX = 11,
@@ -101,7 +101,6 @@ local coroutine_count = 0
local function co_create(f)
local co = table.remove(coroutine_pool)
if co == nil then
local print = print
co = coroutine.create(function(...)
f(...)
while true do
@@ -464,7 +463,7 @@ function skynet.dispatch_unknown_request(unknown)
end
local function unknown_response(session, address, msg, sz)
print("Response message :" , c.tostring(msg,sz))
skynet.error(string.format("Response message :" , c.tostring(msg,sz)))
error(string.format("Unknown session : %d from %x", session, address))
end