diff options
author | Kim Alvefur <zash@zash.se> | 2017-11-21 21:48:43 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-11-21 21:48:43 +0100 |
commit | 170cc278f95862ce3a202291abed8bb7a7c16e80 (patch) | |
tree | f851a13a16e84e1a5dea940fc76633a54bdc860e | |
parent | a031c5073ba0956caf405d49987be3ed32eff99e (diff) | |
download | prosody-170cc278f95862ce3a202291abed8bb7a7c16e80.tar.gz prosody-170cc278f95862ce3a202291abed8bb7a7c16e80.zip |
util.async: Fix thread check to work correctly in Lua 5.2
coroutine.running() now returns the main thread and a boolean true if
called from the main thread, as opposed to nil in 5.1
-rw-r--r-- | util/async.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/async.lua b/util/async.lua index 17a3bae1..992797b8 100644 --- a/util/async.lua +++ b/util/async.lua @@ -1,8 +1,8 @@ local log = require "util.logger".init("util.async"); local function checkthread() - local thread = coroutine.running(); - if not thread then + local thread, main = coroutine.running(); + if not thread or main then error("Not running in an async context, see https://prosody.im/doc/developers/util/async"); end return thread; |