http://hg.omfa.de/prosody-hg/ en-us prosody-hg: prosody history prosody revision history util.time: Import sleep from luasocket http://hg.omfa.de/prosody-hg/log/973609bad40a/prosody
We might not want to use the full LuaSocket for such a tiny function which will
never change.

This drops win32 support but that should be fine.]]> Link Mauve <linkmauve@linkmauve.fr> Fri, 30 Jan 2026 14:08:53 +0100 Merge 13.0->trunk http://hg.omfa.de/prosody-hg/log/af28d6debaca/prosody Kim Alvefur <zash@zash.se> Mon, 09 Feb 2026 18:38:35 +0100 prosody, prosodyctl: Always search installation directory first http://hg.omfa.de/prosody-hg/log/2462247ec377/prosody
Should solve for:
- Running from a source directory like looks for ./{core,net,util}/*.lua first
- `make install && prosody` looks for $prefix/prosody/{core,net,util}/*.lua first
- Installation with luarocks or dh-lua into Lua search paths does not
look for resources in the working directory.]]> Kim Alvefur <zash@zash.se> Mon, 09 Feb 2026 18:30:57 +0100 Merge 13.0->trunk http://hg.omfa.de/prosody-hg/log/6ccc6e0ece29/prosody Kim Alvefur <zash@zash.se> Mon, 09 Feb 2026 17:11:52 +0100 prosody, prosodyctl: Load loader directly from source directory http://hg.omfa.de/prosody-hg/log/b085d32af140/prosody
This should ensure that loader.lua is loaded from the source directory
and does the right thing when installed with `make install`

There are currently three ways Prosody can be run:

- Directly from the source directory, like `./prosody`
- Installed with `make install`
- Installed into Lua paths with e.g. dh-lua or luarocks

In the first two cases, Lua search paths need to include the source
directory and ensure that `require "prosody.util.json"` ends up loading
`util/json.lua` relative to the installation (CFG_SOURCEDIR) or the
source checkout.

Finally, in the last case where Prosody resources are installed under the
'prosody.*' namespace in regular Lua search paths, then loader.lua should
activate the compatibility mode that makes sure that both
`require"util.json"` and `require"prosody.util.json"` both resolve to
`(one path from of package.path)/prosody/util/json.lua`]]> Kim Alvefur <zash@zash.se> Mon, 09 Feb 2026 16:59:42 +0100 loader: Revert bad idea http://hg.omfa.de/prosody-hg/log/50b8d732c905/prosody
Reverts 76ece4dd9782]]> Kim Alvefur <zash@zash.se> Mon, 09 Feb 2026 15:54:02 +0100 loader: Move all path setup here from all executables http://hg.omfa.de/prosody-hg/log/76ece4dd9782/prosody
So it is done in the same way for all the executables, with less code
duplication.]]> Kim Alvefur <zash@zash.se> Mon, 09 Feb 2026 01:57:40 +0100 prosody: Fix loading local code when also installed system-wide http://hg.omfa.de/prosody-hg/log/312542dd184d/prosody
loader.lua is responsible for adjusting the Lua module loading behavior
to account for legacy code (mostly community modules) that don't load
resources with the 'prosody' namespace prefix, like
`require"prosody.util.json"` rather than `require"util.json"`, as well
as the opposite problem of finding resources with the namespace prefix
in a local source directory, where Lua would look for
`./prosody/util/json.lua` instead of `./util/json.lua`.

Which of these two behaviors is active depends on whether the loader is
loaded as `require"prosody.loader"` or `require"loader"`, the former
being intended for system-wide installations and the later for running
from source.

When you have a system-wide Prosody installed to the standard Lua search
paths, the first attempt to require "prosody.loader" would succeed,
leading to system-wide resources being preferred.

This makes it difficult to run Prosody from source, e.g. a different
version or with local patches, as those changes would be ignored.

This change should make it more likely that the loader is invoked as
just "loader" instead of "prosody.loader", which determines]]> Kim Alvefur <zash@zash.se> Sun, 01 Feb 2026 15:22:53 +0100 prosody: Move function only used once into block where it is used http://hg.omfa.de/prosody-hg/log/5b4efb5b798a/prosody
So it is not even instantiated when not used, for whatever tiny
performance gain]]> Kim Alvefur <zash@zash.se> Sun, 01 Feb 2026 15:21:40 +0100 prosody: Abort earlier on incompatible Lua version http://hg.omfa.de/prosody-hg/log/f47b4baa7934/prosody
In order to minimize the amount of code we run before we bail out, as
well as to prepare for rearranging loader and search paths.]]> Kim Alvefur <zash@zash.se> Sun, 01 Feb 2026 15:18:14 +0100 executables: Prefix module imports with prosody namespace http://hg.omfa.de/prosody-hg/log/7214baed9e9d/prosody Kim Alvefur <zash@zash.se> Fri, 17 Mar 2023 16:29:54 +0100 executables: Invoke loader to allow mixing of old and new import style http://hg.omfa.de/prosody-hg/log/4f2accd99373/prosody
Now both require"util.foo" and require"prosody.util.foo" should be
equivalent.]]> Kim Alvefur <zash@zash.se> Fri, 17 Mar 2023 16:29:07 +0100 executables: Reject Lua 5.1 early http://hg.omfa.de/prosody-hg/log/10bb58ad5583/prosody
Prevents attempting to load libraries that may no longer be found and
crashing with a traceback.

Platforms like Debian where multiple Lua versions can be installed at
the same time and 'lua' pointing to one of the installed interpreters
via symlinks, there's the possibility that prosody/prosodyctl may be
invoked with Lua 5.1, which will no longer have any of the rest of
Prosody libraries available to be require(), and thus would immediately
fail with an unfriendly traceback.

Checking and aborting early with a friendlier message and reference to
more information is better.

Part of #1600]]> Kim Alvefur <zash@zash.se> Sat, 02 Jul 2022 17:27:39 +0200 util.startup: Fix async waiting for last shutdown steps http://hg.omfa.de/prosody-hg/log/cc0ec0277813/prosody
Observed problem: When shutting down prosody would immediately exit
after waiting for s2s connections to close, skipping the last cleanup
events and reporting the exit reason and code.

This happens because prosody.main_thread is in a waiting state and
queuing startup.shutdown is dispatched trough the main loop via
nexttick, but since the main loop was no longer running at that point it
proceeded to the end of the prosody script and exited there.]]> Kim Alvefur <zash@zash.se> Tue, 14 Jun 2022 16:28:49 +0200 prosody: Expose main thread on the 'prosody' global http://hg.omfa.de/prosody-hg/log/49ebac8a5260/prosody
To allow running things in it.]]> Kim Alvefur <zash@zash.se> Wed, 06 Oct 2021 14:49:26 +0200 prosody: Run shutdown procedure in async thread http://hg.omfa.de/prosody-hg/log/e22afa09ebf2/prosody Kim Alvefur <zash@zash.se> Tue, 01 Jan 2019 16:43:49 +0100 prosody: Move last cleanup and shutdown code into util.startup http://hg.omfa.de/prosody-hg/log/81f147ddc4ab/prosody Kim Alvefur <zash@zash.se> Tue, 01 Jan 2019 16:42:52 +0100 prosody: Close the state on exit (ie garbage-collect everything) http://hg.omfa.de/prosody-hg/log/a8f0f87e115a/prosody
This ensures __gc is called on everything that may need it, such as
database connections.

It was reported in the chat by Happy that SQLite3 does not close its
state cleanly in WAL mode, leaving the WAL file behind. This is probably
rather a bug in mod_storage_sql, but forcing a final GC sweep should
also help with such things everywhere.]]> Kim Alvefur <zash@zash.se> Tue, 18 May 2021 20:08:37 +0200 Merge 0.11->trunk http://hg.omfa.de/prosody-hg/log/4f655918fef1/prosody Matthew Wild <mwild1@gmail.com> Sun, 19 Jan 2020 15:34:28 +0000 prosody/util.startup: Switch to parse_args() for --root and --config http://hg.omfa.de/prosody-hg/log/25a3c8134b0a/prosody Matthew Wild <mwild1@gmail.com> Sun, 19 Jan 2020 15:27:16 +0000 prosody: Also log status code passed to exit() http://hg.omfa.de/prosody-hg/log/4e63e28ba362/prosody
Sometimes you're just too lazy to `echo $?`]]> Kim Alvefur <zash@zash.se> Fri, 31 May 2019 18:50:34 +0200 prosody: Log shutdown reason (in past tense) as the very last thing http://hg.omfa.de/prosody-hg/log/c8f16fd2a5e3/prosody Kim Alvefur <zash@zash.se> Fri, 31 May 2019 18:50:13 +0200 prosody: Log shutdown reason http://hg.omfa.de/prosody-hg/log/e8153d49caaa/prosody Kim Alvefur <zash@zash.se> Fri, 31 May 2019 17:01:22 +0200 prosody: Get net.server via requre to avoid relying on globals http://hg.omfa.de/prosody-hg/log/fbb6751dbe85/prosody Kim Alvefur <zash@zash.se> Thu, 05 Apr 2018 19:34:51 +0200 prosody: Use prosody.log instead of _G.log because it looks nicer http://hg.omfa.de/prosody-hg/log/e1c4bdb2cd25/prosody Kim Alvefur <zash@zash.se> Thu, 05 Apr 2018 16:00:00 +0200 prosody, util.startup: Switch from async.once() to long-lived thread, to avoid GC http://hg.omfa.de/prosody-hg/log/151ecd18d624/prosody Matthew Wild <mwild1@gmail.com> Fri, 23 Mar 2018 14:18:27 +0000 prosody, prosodyctl, util.startup: Finally factor out startup-related and common code into a separate module http://hg.omfa.de/prosody-hg/log/47e3b8b6f17a/prosody Matthew Wild <mwild1@gmail.com> Tue, 20 Mar 2018 16:10:37 +0000 Merge 0.10->trunk http://hg.omfa.de/prosody-hg/log/433b2a41351f/prosody Kim Alvefur <zash@zash.se> Fri, 29 Sep 2017 13:45:03 +0200 prosody, prosodyctl: Print the actual config file name used when a problem loading it was encountered (see #990) http://hg.omfa.de/prosody-hg/log/5ebad58b2548/prosody Kim Alvefur <zash@zash.se> Wed, 27 Sep 2017 15:33:29 +0200 Merge 0.10->trunk http://hg.omfa.de/prosody-hg/log/e21d82551e05/prosody Matthew Wild <mwild1@gmail.com> Tue, 26 Sep 2017 17:24:25 +0100 prosody: Tiny whitespace fix http://hg.omfa.de/prosody-hg/log/23aee8ccfe9b/prosody Kim Alvefur <zash@zash.se> Sun, 24 Sep 2017 05:46:24 +0200 Merge 0.10->trunk http://hg.omfa.de/prosody-hg/log/a7863f4aae65/prosody Kim Alvefur <zash@zash.se> Tue, 29 Aug 2017 15:24:53 +0200 prosody, prosodyctl: Fix traceback if ssl config is missing (thanks lookshe and sol) http://hg.omfa.de/prosody-hg/log/85a60e863509/prosody Kim Alvefur <zash@zash.se> Tue, 29 Aug 2017 15:23:39 +0200 Merge 0.10->trunk http://hg.omfa.de/prosody-hg/log/a0ad62a269df/prosody Kim Alvefur <zash@zash.se> Mon, 28 Aug 2017 21:05:12 +0200 prosody, prosodyctl: Set up TLS settings for HTTPS requests in net.http (part of fix for #659) http://hg.omfa.de/prosody-hg/log/db82ce3decee/prosody Kim Alvefur <zash@zash.se> Fri, 07 Jul 2017 20:42:35 +0200 configmanager: Remove support for multiple parsers, fixes #852. http://hg.omfa.de/prosody-hg/log/c22d5680ca68/prosody Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> Sat, 27 May 2017 15:32:28 +0100 Merge 0.10->trunk http://hg.omfa.de/prosody-hg/log/2fdb7b3648d8/prosody Kim Alvefur <zash@zash.se> Sun, 29 Jan 2017 22:32:03 +0100 prosody: Silence warnings about setting the globals 'server' and 'socket' [luacheck] http://hg.omfa.de/prosody-hg/log/23c7e3bfd299/prosody Kim Alvefur <zash@zash.se> Sun, 29 Jan 2017 22:31:34 +0100 prosody: Trim trailing whitespace http://hg.omfa.de/prosody-hg/log/c028555866b3/prosody Kim Alvefur <zash@zash.se> Sun, 29 Jan 2017 22:26:38 +0100 Merge 0.10->trunk http://hg.omfa.de/prosody-hg/log/4d182b9a8109/prosody Kim Alvefur <zash@zash.se> Mon, 02 Jan 2017 03:06:51 +0100 prosody: Fix typo http://hg.omfa.de/prosody-hg/log/1aea8978d7ef/prosody Kim Alvefur <zash@zash.se> Mon, 02 Jan 2017 01:51:39 +0100 Merge 0.10->trunk http://hg.omfa.de/prosody-hg/log/1502ec4f3cbe/prosody Kim Alvefur <zash@zash.se> Mon, 21 Nov 2016 02:40:47 +0100 prosody: Add annotations to ignore various globals and unused arguments [luacheck] http://hg.omfa.de/prosody-hg/log/0656392b1685/prosody Kim Alvefur <zash@zash.se> Sun, 20 Nov 2016 11:32:05 +0100 prosody: Set session tables on the 'prosody' global first, then export them as globals http://hg.omfa.de/prosody-hg/log/f8b81a82e8b6/prosody Kim Alvefur <zash@zash.se> Sun, 20 Nov 2016 11:30:26 +0100 Update every link to the documentation to use HTTPS http://hg.omfa.de/prosody-hg/log/a5a080c12c96/prosody Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> Sat, 16 Apr 2016 21:08:05 +0100 prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before loading Prosody. Fixes #308. http://hg.omfa.de/prosody-hg/log/b34a42a10c9f/prosody Matthew Wild <mwild1@gmail.com> Fri, 18 Mar 2016 10:24:46 +0000 prosody: Allow prosody.shutdown() to take an exit code for the process (thanks daurnimator) http://hg.omfa.de/prosody-hg/log/a22d6a46d2ed/prosody Matthew Wild <mwild1@gmail.com> Fri, 15 Jan 2016 00:51:01 +0000 prosody: Don't silently ignore unknown command-line options http://hg.omfa.de/prosody-hg/log/a2e1f5ebdb53/prosody Matthew Wild <mwild1@gmail.com> Thu, 10 Dec 2015 13:33:14 +0000 prosody: Fix sleep call that relied on the no longer existing socket global http://hg.omfa.de/prosody-hg/log/45fa2e554c79/prosody Kim Alvefur <zash@zash.se> Mon, 16 Nov 2015 15:24:36 +0100 prosody: Set a luasocket global, fixes undefined global access in loop() (pending util.startup) http://hg.omfa.de/prosody-hg/log/f076dac78155/prosody Kim Alvefur <zash@zash.se> Wed, 02 Sep 2015 14:25:30 +0200 statsmanager, prosody: New core module and API for gathering statistics about the running server http://hg.omfa.de/prosody-hg/log/6c22bec3e8d0/prosody Matthew Wild <mwild1@gmail.com> Tue, 20 Jan 2015 12:33:20 +0000 prosody: Make getfenv() replacement for require() sandboxing local to avoid polluting the globals table http://hg.omfa.de/prosody-hg/log/67501b5576d3/prosody Kim Alvefur <zash@zash.se> Mon, 13 Oct 2014 21:02:04 +0200 prosody: Fix getfenv replacement for Lua 5.2 http://hg.omfa.de/prosody-hg/log/9af742bb45b2/prosody Kim Alvefur <zash@zash.se> Wed, 17 Sep 2014 14:50:00 +0200 Merge 0.9->0.10 http://hg.omfa.de/prosody-hg/log/dab7ad6fa23c/prosody Kim Alvefur <zash@zash.se> Thu, 10 Apr 2014 13:15:11 +0200 prosody: Check dependencies later in the startup sequence http://hg.omfa.de/prosody-hg/log/95b3a59d7932/prosody Kim Alvefur <zash@zash.se> Wed, 09 Apr 2014 20:46:39 +0200 Merge 0.9->0.10 http://hg.omfa.de/prosody-hg/log/56d81af64fc5/prosody Matthew Wild <mwild1@gmail.com> Fri, 13 Dec 2013 12:52:39 +0000 prosody: Store the config file name so the same file can be used when reloading http://hg.omfa.de/prosody-hg/log/bcad61007a4e/prosody Kim Alvefur <zash@zash.se> Fri, 13 Dec 2013 10:25:40 +0100 Merge Tobias SCRAM-PLUS work http://hg.omfa.de/prosody-hg/log/fb6573e191cf/prosody Kim Alvefur <zash@zash.se> Sun, 22 Sep 2013 00:44:20 +0200 Backout ae48bf828f21 http://hg.omfa.de/prosody-hg/log/1a71069dcacf/prosody Kim Alvefur <zash@zash.se> Sun, 22 Sep 2013 00:37:04 +0200 Run with own LuaSec. http://hg.omfa.de/prosody-hg/log/ae48bf828f21/prosody Tobias Markmann <tm@ayena.de> Mon, 17 Jan 2011 16:50:21 +0100