Annotate

mod_http_libjs/mod_http_libjs.lua @ 6112:4c0e3fe57e92

mod_compliance_latest: Gracefull error logging on missing dependency. diff --git a/mod_compliance_latest/README.md b/mod_compliance_latest/README.md --- a/mod_compliance_latest/README.md +++ b/mod_compliance_latest/README.md @@ -9,13 +9,15 @@ rockspec: # Introduction -This module will always require and load to the lastest compliance tester we have in the community modules. -Currently this is [mod_compliance_2023]. +This meta-module will always `require` (and therefore auto-load) the lastest compliance tester we have in the community modules. +Currently this is [mod_compliance_2023]. See the linked module for further details. + +If you do not use the *Prosody plugin installer* this module will likely have limited value to you. +You can also just install the current compliance tester manually. # Configuration -Just load this module as any other module and it will automatically install [mod_compliance_2023] if you use the Prosody plugin installer. -See the linked module for further details. +Just load this module as any other module and it will automatically install and load [mod_compliance_2023] if you use the *Prosody plugin installer*. # Compatibility diff --git a/mod_compliance_latest/mod_compliance_latest.lua b/mod_compliance_latest/mod_compliance_latest.lua --- a/mod_compliance_latest/mod_compliance_latest.lua +++ b/mod_compliance_latest/mod_compliance_latest.lua @@ -1,1 +1,6 @@ -module:depends("compliance_2023"); +local success, err = pcall(function() module:depends("compliance_2023") end) + +if not success then + module:log("error", "Error, can't load module: mod_compliance_2023. Is this module downloaded in a folder readable by prosody?") + return 1, "Error: Couldn't load dependency mod_compliance_2023." +end
author Menel <menel@snikket.de>
date Mon, 23 Dec 2024 12:58:03 +0100
parent 4976:75b6e5df65f9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4087
88a469b285f5 mod_http_libjs: New module to serve common CSS/Javascript libraries
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
1 local mime_map = module:shared("/*/http_files/mime").types or {
88a469b285f5 mod_http_libjs: New module to serve common CSS/Javascript libraries
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
2 css = "text/css",
88a469b285f5 mod_http_libjs: New module to serve common CSS/Javascript libraries
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
3 js = "application/javascript",
88a469b285f5 mod_http_libjs: New module to serve common CSS/Javascript libraries
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
4 };
88a469b285f5 mod_http_libjs: New module to serve common CSS/Javascript libraries
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
5
4095
de2390d6bbe4 mod_http_libjs: Add compatibility with Prosody 0.11.x
Matthew Wild <mwild1@gmail.com>
parents: 4087
diff changeset
6 local serve;
4976
75b6e5df65f9 various: Improve error reporting if missing file server module on 0.12
Kim Alvefur <zash@zash.se>
parents: 4604
diff changeset
7 if prosody.process_type == "prosody" then
4095
de2390d6bbe4 mod_http_libjs: Add compatibility with Prosody 0.11.x
Matthew Wild <mwild1@gmail.com>
parents: 4087
diff changeset
8 local http_files = require "net.http.files";
de2390d6bbe4 mod_http_libjs: Add compatibility with Prosody 0.11.x
Matthew Wild <mwild1@gmail.com>
parents: 4087
diff changeset
9 serve = http_files.serve;
4976
75b6e5df65f9 various: Improve error reporting if missing file server module on 0.12
Kim Alvefur <zash@zash.se>
parents: 4604
diff changeset
10 else
4095
de2390d6bbe4 mod_http_libjs: Add compatibility with Prosody 0.11.x
Matthew Wild <mwild1@gmail.com>
parents: 4087
diff changeset
11 serve = module:depends"http_files".serve;
de2390d6bbe4 mod_http_libjs: Add compatibility with Prosody 0.11.x
Matthew Wild <mwild1@gmail.com>
parents: 4087
diff changeset
12 end
de2390d6bbe4 mod_http_libjs: Add compatibility with Prosody 0.11.x
Matthew Wild <mwild1@gmail.com>
parents: 4087
diff changeset
13
4087
88a469b285f5 mod_http_libjs: New module to serve common CSS/Javascript libraries
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
14 local libjs_path = module:get_option_string("libjs_path", "/usr/share/javascript");
88a469b285f5 mod_http_libjs: New module to serve common CSS/Javascript libraries
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
15
4604
f0efbb0b0b5b mod_http_libjs: Check that the path to serve exists
Kim Alvefur <zash@zash.se>
parents: 4095
diff changeset
16 do -- sanity check
f0efbb0b0b5b mod_http_libjs: Check that the path to serve exists
Kim Alvefur <zash@zash.se>
parents: 4095
diff changeset
17 local lfs = require "lfs";
f0efbb0b0b5b mod_http_libjs: Check that the path to serve exists
Kim Alvefur <zash@zash.se>
parents: 4095
diff changeset
18
f0efbb0b0b5b mod_http_libjs: Check that the path to serve exists
Kim Alvefur <zash@zash.se>
parents: 4095
diff changeset
19 local exists, err = lfs.attributes(libjs_path, "mode");
f0efbb0b0b5b mod_http_libjs: Check that the path to serve exists
Kim Alvefur <zash@zash.se>
parents: 4095
diff changeset
20 if exists ~= "directory" then
f0efbb0b0b5b mod_http_libjs: Check that the path to serve exists
Kim Alvefur <zash@zash.se>
parents: 4095
diff changeset
21 module:log("error", "Problem with 'libjs_path': %s", err or "not a directory");
f0efbb0b0b5b mod_http_libjs: Check that the path to serve exists
Kim Alvefur <zash@zash.se>
parents: 4095
diff changeset
22 end
f0efbb0b0b5b mod_http_libjs: Check that the path to serve exists
Kim Alvefur <zash@zash.se>
parents: 4095
diff changeset
23 end
f0efbb0b0b5b mod_http_libjs: Check that the path to serve exists
Kim Alvefur <zash@zash.se>
parents: 4095
diff changeset
24
4087
88a469b285f5 mod_http_libjs: New module to serve common CSS/Javascript libraries
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
25 module:provides("http", {
88a469b285f5 mod_http_libjs: New module to serve common CSS/Javascript libraries
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
26 default_path = "/share";
88a469b285f5 mod_http_libjs: New module to serve common CSS/Javascript libraries
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
27 route = {
4095
de2390d6bbe4 mod_http_libjs: Add compatibility with Prosody 0.11.x
Matthew Wild <mwild1@gmail.com>
parents: 4087
diff changeset
28 ["GET /*"] = serve({ path = libjs_path, mime_map = mime_map });
4087
88a469b285f5 mod_http_libjs: New module to serve common CSS/Javascript libraries
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
29 }
88a469b285f5 mod_http_libjs: New module to serve common CSS/Javascript libraries
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
30 });