Mercurial > prosody-modules

diff mod_conversejs/mod_conversejs.lua @ 4976:75b6e5df65f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
various: Improve error reporting if missing file server module on 0.12 If there is some error loading net.http.files then it would be swallowed by the pcall and then it would proceed to trying mod_http_files, which might cause unexpected behavior on 0.12 Ref #1765
author Kim Alvefur <zash@zash.se>
date Mon, 18 Jul 2022 22:47:54 +0200
parents f2c918fe8cf0
children 079ca766193b
line wrap: on
line diff
--- a/mod_conversejs/mod_conversejs.lua	Mon Jul 18 13:58:27 2022 +0200
+++ b/mod_conversejs/mod_conversejs.lua	Mon Jul 18 22:47:54 2022 +0200
@@ -29,11 +29,11 @@
 local resources = module:get_option_path("conversejs_resources");
 if resources then
 	local serve;
-	if not pcall(function()
+	if prosody.process_type == "prosody" then
 		-- Prosody >= trunk / 0.12
 		local http_files = require "net.http.files";
 		serve = http_files.serve;
-	end) then
+	else
 		-- Prosody <= 0.11
 		serve = module:depends "http_files".serve;
 	end