aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* net.server_event: Don't close servers if just quitting the loop onceMatthew Wild2018-04-101-1/+3
|
* loggingmanager: Remove luacheck annotations for global log functions that ↵Kim Alvefur2018-04-101-1/+0
| | | | are now set in util.startup
* net.server_select: Allow setquitting("once") to allow resuming the loop laterMatthew Wild2018-04-101-2/+2
|
* util.startup: Initialize logging immediately after configuration is read ↵Matthew Wild2018-04-101-1/+2
| | | | (which is how it used to work)
* mod_bosh: Improve connection robustness with better handling of unexpected ridsMatthew Wild2018-04-101-12/+19
|
* mod_bosh: Some additonal comments to improve code readabilityMatthew Wild2018-04-101-1/+3
|
* mod_bosh: WhitespaceMatthew Wild2018-04-101-1/+0
|
* mod_bosh: Improve logging - parse errors will now log through the session ↵Matthew Wild2018-04-101-1/+2
| | | | logger if possible
* mod_bosh: Improve logging on session close (reason may be a table with params)Matthew Wild2018-04-101-1/+1
|
* Merge 0.10->trunkKim Alvefur2018-04-101-6/+3
|\
| * mod_blocklist: Allow mod_presence to handle subscription stanzas before ↵Kim Alvefur2018-04-061-6/+3
| | | | | | | | bouncing outgoing presence (fixes #575)
* | mod_register_limits: Promote log message about inability to apply ↵Kim Alvefur2018-04-101-1/+1
| | | | | | | | black/whitelists to a warning
* | mod_register_limits: Change debug message wording, there's no user yetKim Alvefur2018-04-101-1/+1
| |
* | mod_register_limits: Use existing local variableKim Alvefur2018-04-101-2/+2
| |
* | mod_register_ibr: Return a textual error to the user for problems with ↵Kim Alvefur2018-04-091-1/+3
| | | | | | | | parsing form data
* | mod_register_ibr: Reshape the code using early returns to reduce needless ↵Kim Alvefur2018-04-071-58/+71
| | | | | | | | indentation
* | util.ringbuffer: Fix typo in comment [codespell]Kim Alvefur2018-04-061-1/+1
| |
* | util.startup/prosodyctl: Delay enabling global protection until last ↵Kim Alvefur2018-04-061-1/+1
| | | | | | | | (silences warning about CFG_PLUGINDIR)
* | util.startup: Fix traceback due to both plugin path becoming nil if ↵Kim Alvefur2018-04-061-1/+1
| | | | | | | | plugin_paths is unset
* | net.connlisteners: Remove duplicated field in exports [luacheck]Kim Alvefur2018-04-061-1/+0
| |
* | Merge 0.10->trunkKim Alvefur2018-04-061-0/+1
|\|
| * net.http: Import setmetatable into local scope (fixes #1125)Kim Alvefur2018-04-061-0/+1
| |
* | mod_ping: Ignore unused arguments [luacheck]Kim Alvefur2018-04-061-1/+1
| |
* | Fix spelling throughout the codebase [codespell]Kim Alvefur2018-02-0417-35/+35
| |
* | luacheckrc: No longer ignore use of the global 'server' (net.server)Kim Alvefur2018-04-051-1/+0
| |
* | prosody: Get net.server via requre to avoid relying on globalsKim Alvefur2018-04-051-0/+1
| |
* | mod_muc_mam: Save the MUC <x> on recorded join stanzasKim Alvefur2018-03-241-1/+1
| |
* | mod_muc_mam: Let muc/history.lib decide which messages to storeKim Alvefur2018-03-241-4/+2
| |
* | mod_muc_mam: Remove 0.10 compat codeKim Alvefur2017-12-121-97/+4
| |
* | mod_muc_mam: Import mod_mam_muc from prosody-modules ba6466fa6823Kim Alvefur2018-04-022-0/+463
| |
* | util.startup: Set up event hooks for reloading logging here instead of in ↵Kim Alvefur2018-04-052-7/+6
| | | | | | | | loggingmanager to simplify startup dependencies
* | util.startup: Initialize prosody.log / _G.log here instead of in ↵Kim Alvefur2018-04-052-4/+5
| | | | | | | | loggingmanager to reduce dependencies
* | util.startup: Initialize logging earlier, so that messages from eg ↵Kim Alvefur2018-04-051-1/+1
| | | | | | | | net.server are shown
* | prosodyctl: Use prosody.hosts instead of _G.hostsKim Alvefur2018-03-291-8/+8
| |
* | core: Use prosody.hosts instead of _G.hosts for consistencyKim Alvefur2018-03-295-5/+5
| |
* | luacheckrc: Forget about _G.hosts, things should use _G.prosody.hostsKim Alvefur2018-03-291-2/+0
| |
* | util.startup: Access the hosts table via the prosody global for consistencyKim Alvefur2018-03-291-1/+1
| |
* | prosody: Use prosody.log instead of _G.log because it looks nicerKim Alvefur2018-04-051-5/+5
| |
* | util.startup: Use own logger instead of the possibly not available yet _G.logKim Alvefur2018-04-051-0/+1
| |
* | util.startup: Remove luacheck directive for ignoring use of _G.log which ↵Kim Alvefur2018-04-051-3/+0
| | | | | | | | might not exist until loggingmanager has been loaded
* | net.server: Init a local logger (fixes traceback on attempt to warn about ↵Kim Alvefur2018-04-051-0/+1
| | | | | | | | missing luaevent due to later loggingmanager initialization)
* | luacheckrc: Remove allowance for the global log() since it may not exist as ↵Kim Alvefur2018-04-051-1/+0
| | | | | | | | early as before
* | Merge 0.10 -> trunkMatthew Wild2018-04-041-2/+1
|\|
| * CHANGES: Normalize syntaxKim Alvefur2018-04-031-2/+1
| |
* | Merge 0.10 -> trunkMatthew Wild2018-04-041-1/+1
|\|
| * net.http: Fix parameter order to http request callbacksMatthew Wild2018-04-041-1/+1
| | | | | | | | | | | | Commit e3b9dc9dd940 changed the parameter order in 2013, but did not update the names of the parameters in the callback function. Due to this inconsistency, 12df41a5a4b1 accidentally reversed the order when fixing the variable names without fixing where they are used. Additionally the documentation was incorrect (since 2013), and this has also now been fixed.
| * MUC: Don't reply to errors with more errors (fixes #1122)Kim Alvefur2018-03-281-1/+3
| |
| * MUC: Say something about storage failure before aborting (see #1091)Kim Alvefur2018-03-121-0/+1
| |
| * MUC: Prevent creation of room that could not be loaded from storage (see #1091)Kim Alvefur2018-03-091-2/+8
| |
| * MUC: Abort module loading if unable to get list of persistent rooms from ↵Kim Alvefur2018-03-071-1/+5
| | | | | | | | storage (fixes #1091)