mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
11598 commits 12 branches 100 tags 40 MiB
Commit graph

2013 commits

Author SHA1 Message Date
Kim Alvefur
f0069378bd util.datamanager: Support iterating over any file extension 
The 'typ' argument to all other functions is the actual file extension,
but not here for some reason.

May need this for iterating over the .bin files created by
mod_http_file_share in the future.
 2021-02-07 19:23:33 +01:00
Kim Alvefur
1f7686a6bd util.xmppstream: Ensure stream 'id' is always present (fix #1626) 
Backout c2d144d3f8dd
 2021-02-03 16:14:43 +01:00
Kim Alvefur
739c6859c7 util.adhoc: Propagate error with producing initial initial data 
Bonus: Allow use of util.error tables
 2021-01-31 21:10:03 +01:00
Kim Alvefur
414c232247 Merge 0.11->trunk 2021-01-25 21:26:45 +01:00
Kim Alvefur
acdd02670b util.interpolation: Fix combination of filters and fallback values #1623 2021-01-25 20:58:11 +01:00
Kim Alvefur
7146762a6d util.startup: Make installer_plugin_path relative to data directory 
Having it relative to current working directory is problematic since
this depends on how Prosody was started and changes to the data
directory during startup (but after this point).
 2021-01-24 16:12:53 +01:00
Kim Alvefur
4b30620234 util.startup: Don't create installer plugin path (as root) 
Since this runs before dropping root, the directory ends up being owned
by root, resulting in luarocks failing to install anything, since by
then it would be running as the prosody user.

luarocks creates this directory if needed, so creating it during startup
is not necessary.

One potential issue is if the directory is somewhere where Prosody can't
write, but then you will simply have to create it yourself with the
appropriate permissions.
 2021-01-24 15:57:48 +01:00
Kim Alvefur
dc043e287f util.prosodyctl.check: Recognise global options related to plugin installer 2021-01-21 23:38:44 +01:00
Kim Alvefur
d08faec302 util.prosodyctl: Remove unused calculation [luacheck] 2021-01-21 19:18:38 +01:00
Kim Alvefur
ece1e74b93 util.prosodyctl: Rename unused variable to '_' [luacheck] 2021-01-21 19:17:31 +01:00
Kim Alvefur
4b22be7651 util.prosodyctl: Always return exit code from luarocks 
os.exit(true) errors on Lua 5.1
 2021-01-21 19:15:28 +01:00
Kim Alvefur
a97dd68fa1 prosodyctl: Move UI related calls out of util.prosodyctl 
I think this follows the general separation of duties between prosodyctl
and util.prosodyctl better.
 2021-01-21 19:04:57 +01:00
Kim Alvefur
1b02539390 util.prosodyctl: Reword message to sound more natural 
English is hard. "to" might also work, but we'll go with this for now.

18:32:11 <MattJ> s/at/in/ ?
18:32:19 <MattJ> to match luarocks :)
 2021-01-21 18:50:19 +01:00
Kim Alvefur
560261b88e util.prosodyctl: Propagate status from luarocks invocation 2021-01-21 18:43:16 +01:00
Kim Alvefur
3319886e03 util.prosodyctl: Use installer path prepared by util.startup 2021-01-21 18:39:18 +01:00
Kim Alvefur
c15f7674f0 util.datamanager: Fix not passing variables as format string to logger (thanks semgrep) 
Passing error messages as format string could lead to errors, although
not a problem anymore since util.format sanitizes this.
 2021-01-16 15:49:46 +01:00
Kim Alvefur
609b9d1ecf util.timer: Ensure timers can't run more than once per tick (fixes #1620) 
See longer explanation in 2c559953ad41
 2021-01-08 23:23:56 +01:00
Kim Alvefur
086b5cffbb util.stanza: Move misplaced argument to correct place 
valid_utf8() takes only one argument, so the false was probably meant
to be valid_xml_cdata(text, attribute=false)
 2020-12-24 17:57:28 +01:00
Kim Alvefur
f4dd4dd8b8 Merge 0.11->trunk 2021-01-08 23:56:27 +01:00
Kim Alvefur
4cb0cd9125 util.timer: Ensure timers can't run more than once per tick (fixes #1620) 
See longer explanation in 2c559953ad41
 2021-01-08 23:23:56 +01:00
Kim Alvefur
d6918df73a util.stanza: Move misplaced argument to correct place 
valid_utf8() takes only one argument, so the false was probably meant
to be valid_xml_cdata(text, attribute=false)
 2020-12-24 17:57:28 +01:00
Matthew Wild
ab2d0056a5 util.promise: Use xpcall() for promise function to preserve tracebacks 2020-11-23 20:38:51 +00:00
Matthew Wild
15a1cfbde6 util.promise: Use xpcall() for promise function to preserve tracebacks 2020-11-23 20:38:51 +00:00
Kim Alvefur
8a0198f4be util.stanza: Reject ASCII control characters (fixes #1606) 2020-11-11 16:00:41 +01:00
Kim Alvefur
54da54d9ed util.stanza: Reject ASCII control characters (fixes #1606) 2020-11-11 16:00:41 +01:00
Matthew Wild
11dcc6f62a util.dbuffer: Optimize :sub() and :byte() 2020-10-28 14:21:09 +00:00
Matthew Wild
bfc6da0a67 util.dbuffer: Optimize :sub() and :byte() 2020-10-28 14:21:09 +00:00
Matthew Wild
c2e10f8ef6 util.debug: Fix locals being reported under wrong stack frame in some cases (+tests!!) 2020-10-16 13:38:04 +01:00
Matthew Wild
8677aeb722 util.debug: Fix locals being reported under wrong stack frame in some cases (+tests!!) 2020-10-16 13:38:04 +01:00
Matthew Wild
da31a10857 util.error: Switch to util.debug traceback tables and remove display_tracebacks option 2020-12-09 14:51:40 +00:00
Matthew Wild
54d7877a07 util.error: Expose is_error on registry objects for convenience 2020-12-09 14:00:13 +00:00
Matthew Wild
919a05543a util.error: rename is_err() -> is_error() 
More descriptive and consistent with e.g. is_promise().
 2020-12-09 13:59:51 +00:00
Matthew Wild
dbdf490e62 util.error: Add coerce and wrap methods to registry(?) objects 2020-12-09 13:55:10 +00:00
Matthew Wild
b90fc1e30c Merge 0.11->trunk 2020-11-23 20:39:47 +00:00
Kim Alvefur
e367756529 util.hashring: Normalize indentation to tabs 2020-11-15 14:48:59 +01:00
Kim Alvefur
8d66f94b9e util.error: Remove a stray word from a comment 
Earlier in the process the namespace could be given in the registry
table, the comment would have read

> registry can be given as second argument if namespace is either not
> used or is given in the registry table

The word seems to have been left when this method was scrapped for being
complicated and redundant.
 2020-11-14 22:22:46 +01:00
Kim Alvefur
fe83eba733 Merge 0.11->trunk 2020-11-11 16:09:55 +01:00
Kim Alvefur
347d99192b util.prosodyctl.cert: Fix for prompt functions having moved to util.human.io 2020-11-09 12:38:32 +01:00
Matthew Wild
4afbfc6854 util.cache: Add __name to metatable 2020-10-30 14:05:07 +00:00
Matthew Wild
f29013fb0c util.dbuffer: Add __name to metatable 2020-10-30 13:53:39 +00:00
Matthew Wild
74962fab10 Merge 0.11->trunk 2020-10-28 14:32:33 +00:00
Kim Alvefur
b6f4936b57 util.paths: Optimize path joining with few arguments 
A casual search suggests that the majority of paths.join() calls involve
only two arguments. This saves the creation of a table for up to 3
arguments.

Looks like 3x faster for 3 arguments or less, 5% slower when it uses the
array to concatenate.
 2020-10-11 23:04:13 +02:00
Matthew Wild
ae33d82d35 Merge 0.11->trunk 2020-10-16 13:44:51 +01:00
Kim Alvefur
fba7208d20 util.sasl.scram: Use util.strbitop for XOR step 2019-09-07 13:38:02 +02:00
Matthew Wild
bbc78f6e85 util.error: Pass through existing error objects passed to new() 2020-10-15 13:43:03 +01:00
Kim Alvefur
ab1977f889 Merge 0.11->trunk 2020-10-12 21:29:20 +02:00
Kim Alvefur
d16ccb5cc1 util.dbuffer: Expose length as :len() method, like strings 
Ref #1598
 2020-10-12 20:20:02 +02:00
Matthew Wild
1adf1d813b util.startup: Handle missing nparams field from debug info (not present in 5.1) 2020-10-11 20:25:32 +01:00
Kim Alvefur
f7b9858229 util.startup: Include arguments in function string representation 
Improves usability of the console when digging around the internals.

No specific rationale for the function<file:line>(args) format, it
looked best of the variants I tried.
 2020-10-09 17:41:10 +02:00
Kim Alvefur
9a137bf062 util.startup: Retrieve less data for function string representation 
debug.getinfo(f) collects more info than what is needed here.
 2020-10-09 17:34:04 +02:00