Skip to content

Commit 53a691a

Browse files
author
John O'Connor
committed
fix bug in thread_opts parser
1 parent f000a05 commit 53a691a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/lua/lzmq/impl/threads.lua

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,26 +117,26 @@ local function make_pipe(ctx)
117117
return pipe, pipe_endpoint
118118
end
119119

120-
local zthreads = {}
121-
122120
local function thread_opts(code, default_thread_opts)
123121
local source
124122
local prelude
125123
local lua_init
126124
if type(code) == "table" then
127-
source = code[1] or code.source or default_thread_opts.source
128-
prelude = code.prelude or default_thread_opts.prelude
129-
lua_init = code.lua_init or default_thread_opts.lua_init
125+
source = code[1] or code.source
126+
prelude = code.prelude
127+
lua_init = code.lua_init
130128
else
131129
source = code
132130
end
133131
return {
134-
[1] = assert(source),
135-
prelude = prelude,
136-
lua_init = lua_init
132+
[1] = assert(source) or default_thread_opts.source,
133+
prelude = prelude or default_thread_opts.prelude,
134+
lua_init = lua_init or default_thread_opts.lua_init
137135
}
138136
end
139137

138+
local zthreads = {}
139+
140140
function zthreads.run(ctx, code, ...)
141141
if ctx then ctx = ctx:lightuserdata() end
142142
return Threads.new(thread_opts(code, run_starter), ZMQ_NAME, ctx, ...)

0 commit comments

Comments
 (0)