]> granicus.if.org Git - ejabberd/log
ejabberd
7 years agoFix a typo
Evgeniy Khramtsov [Fri, 14 Apr 2017 17:40:39 +0000 (20:40 +0300)]
Fix a typo

7 years agoFix ejabberd_router:is_my_route/1
Evgeniy Khramtsov [Fri, 14 Apr 2017 17:34:00 +0000 (20:34 +0300)]
Fix ejabberd_router:is_my_route/1

7 years agoDon't forget to disconnect
Evgeniy Khramtsov [Fri, 14 Apr 2017 17:32:26 +0000 (20:32 +0300)]
Don't forget to disconnect

7 years agoUse cache in front of Redis/SQL RAM backends
Evgeniy Khramtsov [Fri, 14 Apr 2017 10:57:52 +0000 (13:57 +0300)]
Use cache in front of Redis/SQL RAM backends

7 years agoBump xmpp dependency, it's required by previous commit
Paweł Chmielowski [Fri, 14 Apr 2017 07:47:25 +0000 (09:47 +0200)]
Bump xmpp dependency, it's required by previous commit

7 years agoAllow a room admin to unsubscribe another JID
Badlop [Thu, 13 Apr 2017 20:37:39 +0000 (22:37 +0200)]
Allow a room admin to unsubscribe another JID

7 years agoTravis CI: Update MySQL package
Holger Weiss [Tue, 11 Apr 2017 11:52:10 +0000 (13:52 +0200)]
Travis CI: Update MySQL package

The "mysql-server-5.6" package is no longer available.

7 years agomod_muc_room: Replace deprecated function call
Holger Weiss [Tue, 11 Apr 2017 11:38:33 +0000 (13:38 +0200)]
mod_muc_room: Replace deprecated function call

Use jid:decode/1 instead of jlib:string_to_jid/1.

7 years agoRename aux.erl as misc.erl 17.04
Christophe Romain [Tue, 11 Apr 2017 10:13:58 +0000 (12:13 +0200)]
Rename aux.erl as misc.erl

Thanks Microsoft Windows to not support some filenames

7 years agoUse p1_utils 1.0.8
Christophe Romain [Tue, 11 Apr 2017 06:11:29 +0000 (08:11 +0200)]
Use p1_utils 1.0.8

7 years agoNew muc_register_nick command (thanks to Peter Marheine)(#1407)
Badlop [Mon, 10 Apr 2017 10:23:14 +0000 (12:23 +0200)]
New muc_register_nick command (thanks to Peter Marheine)(#1407)

7 years agoMerge pull request #1666 from weiss/fix-csi
Christophe Romain [Fri, 7 Apr 2017 13:10:39 +0000 (15:10 +0200)]
Merge pull request #1666 from weiss/fix-csi

Let CSI keep latest stanzas of each given full JID

7 years agoMerge pull request #1664 from weiss/fix-routing
Christophe Romain [Fri, 7 Apr 2017 13:10:26 +0000 (15:10 +0200)]
Merge pull request #1664 from weiss/fix-routing

Fix routing of groupchat and headline messages

7 years agoLet ext_mod be aware of p1_utils includes
Christophe Romain [Fri, 7 Apr 2017 10:51:43 +0000 (12:51 +0200)]
Let ext_mod be aware of p1_utils includes

7 years agoGenerate ejabberd lib dir when not available in code server (#1665)
Christophe Romain [Fri, 7 Apr 2017 10:09:43 +0000 (12:09 +0200)]
Generate ejabberd lib dir when not available in code server (#1665)

This is the case if running ejabberd from development directory
when code:lib_dir(ejabberd) returns {error, nad_name}.

7 years agoImprove S2S examples (#1583)
Christophe Romain [Fri, 7 Apr 2017 09:12:27 +0000 (11:12 +0200)]
Improve S2S examples (#1583)

7 years agoAdd more examples on config template (#1583)
Christophe Romain [Fri, 7 Apr 2017 09:02:11 +0000 (11:02 +0200)]
Add more examples on config template (#1583)

7 years agoMerge pull request #1660 from michal800106/master
Christophe Romain [Fri, 7 Apr 2017 08:04:38 +0000 (10:04 +0200)]
Merge pull request #1660 from michal800106/master

Fix order of starting supervisors.

7 years agoImprove logging of Redis errors
Evgeniy Khramtsov [Fri, 7 Apr 2017 06:10:33 +0000 (09:10 +0300)]
Improve logging of Redis errors

7 years agomod_client_state: Remove some empty lines
Holger Weiss [Thu, 6 Apr 2017 21:00:53 +0000 (23:00 +0200)]
mod_client_state: Remove some empty lines

7 years agomod_client_state: Queue stanzas of each full JID
Holger Weiss [Thu, 6 Apr 2017 20:19:00 +0000 (22:19 +0200)]
mod_client_state: Queue stanzas of each full JID

Keep the latest stanzas of each given full JID, rather than dropping
them when stanzas from a different resource are received.  This change
makes sure the recipient receives the latest status of all clients of
each contact.  It also ensures the recipient will see the current list
of occupants of joined MUC rooms.

7 years agomod_client_state: Don't keep track of queue size
Holger Weiss [Thu, 6 Apr 2017 19:01:26 +0000 (21:01 +0200)]
mod_client_state: Don't keep track of queue size

Use maps:size/1 rather than keeping track of the size ourselves.

7 years agoImprove type specs and return values
Evgeniy Khramtsov [Thu, 6 Apr 2017 17:56:46 +0000 (20:56 +0300)]
Improve type specs and return values

7 years agoAdd Redis pool support
Evgeniy Khramtsov [Thu, 6 Apr 2017 14:56:37 +0000 (17:56 +0300)]
Add Redis pool support

Fixes #1624

7 years agoSet default prefix to /usr/local
Christophe Romain [Thu, 6 Apr 2017 13:35:02 +0000 (15:35 +0200)]
Set default prefix to /usr/local

7 years agoFix order of starting supervisors.
michal [Thu, 6 Apr 2017 06:50:23 +0000 (08:50 +0200)]
Fix order of starting supervisors.
ExtMod should be loaded before GenModSupervisor because ext_mod adds proper paths to ebin from modules (ejabberd-contrib).
Without this change you have to add -pa parameter with path to module's ebin.

7 years agoejabberd_sm: Fix routing of headline messages
Holger Weiss [Wed, 5 Apr 2017 19:03:13 +0000 (21:03 +0200)]
ejabberd_sm: Fix routing of headline messages

As per RFC 6121, silently drop headline messages sent to the bare JID of
an offline user or to the full JID of an unavailable resource.

7 years agoejabberd_sm: Fix routing of groupchat messages
Holger Weiss [Wed, 5 Apr 2017 18:41:10 +0000 (20:41 +0200)]
ejabberd_sm: Fix routing of groupchat messages

As per RFC 6121, don't (re)route groupchat messages sent to a bare JID
or to an unavailable resource.

7 years agoejabberd_sm: Fix typo in debug message
Holger Weiss [Wed, 5 Apr 2017 18:23:28 +0000 (20:23 +0200)]
ejabberd_sm: Fix typo in debug message

7 years agoAdd description to feature-not-implemented error
Evgeniy Khramtsov [Wed, 5 Apr 2017 12:19:00 +0000 (15:19 +0300)]
Add description to feature-not-implemented error

7 years agoSet 'read_concurrency' for some ETS tables
Evgeniy Khramtsov [Wed, 5 Apr 2017 12:10:18 +0000 (15:10 +0300)]
Set 'read_concurrency' for some ETS tables

7 years agoDon't misuse monotonic_time/0
Evgeniy Khramtsov [Wed, 5 Apr 2017 07:42:42 +0000 (10:42 +0300)]
Don't misuse monotonic_time/0

7 years agoDisable mix tests
Christophe Romain [Tue, 4 Apr 2017 15:02:15 +0000 (17:02 +0200)]
Disable mix tests

7 years agoDon't log warning on successful ping reply
Evgeniy Khramtsov [Tue, 4 Apr 2017 14:14:24 +0000 (17:14 +0300)]
Don't log warning on successful ping reply

7 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Tue, 4 Apr 2017 06:53:45 +0000 (09:53 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoFix c2s connection close on demand
Evgeniy Khramtsov [Tue, 4 Apr 2017 06:52:42 +0000 (09:52 +0300)]
Fix c2s connection close on demand

Fixes #1652

7 years agoForget prepared SQL queries on database connect (#1325)
Alexey Shchepin [Mon, 3 Apr 2017 13:30:02 +0000 (16:30 +0300)]
Forget prepared SQL queries on database connect (#1325)

7 years agoAlways init pubsub_index when using mnesia
Christophe Romain [Mon, 3 Apr 2017 10:13:03 +0000 (12:13 +0200)]
Always init pubsub_index when using mnesia

7 years agoChange mnesia dir detection
Alexey Shchepin [Mon, 3 Apr 2017 09:57:23 +0000 (12:57 +0300)]
Change mnesia dir detection

7 years agoRemove obsolete mnesia migration calls
Christophe Romain [Mon, 3 Apr 2017 09:32:13 +0000 (11:32 +0200)]
Remove obsolete mnesia migration calls

Now that plugins directly use ejabberd_mnesia and can include their own
transform handler, we don't need pubsub_migrate anymore.

People upgrading from 2.1.1x version must upgrade to 17.01 first.
pubsub_migrate module remains to support any manual process requiring it

7 years agoImprove redis related code
Evgeniy Khramtsov [Sun, 2 Apr 2017 08:56:09 +0000 (11:56 +0300)]
Improve redis related code

7 years agoUse ejabberd_sql:abort/1 instead of exit/1
Evgeniy Khramtsov [Fri, 31 Mar 2017 16:10:07 +0000 (19:10 +0300)]
Use ejabberd_sql:abort/1 instead of exit/1

7 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Fri, 31 Mar 2017 16:08:16 +0000 (19:08 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoAdd Redis as mod_proxy65 RAM backend
Evgeniy Khramtsov [Fri, 31 Mar 2017 16:07:56 +0000 (19:07 +0300)]
Add Redis as mod_proxy65 RAM backend

7 years agoAdd ejabberd_sql:abort/1 and ejabberd_sql:restart/1
Alexey Shchepin [Fri, 31 Mar 2017 14:37:18 +0000 (17:37 +0300)]
Add ejabberd_sql:abort/1 and ejabberd_sql:restart/1

7 years agoAdd SQL as mod_proxy65 RAM backend
Evgeniy Khramtsov [Fri, 31 Mar 2017 05:16:28 +0000 (08:16 +0300)]
Add SQL as mod_proxy65 RAM backend

7 years agoRaise bad_node instead of node_down for consistency reason
Evgeniy Khramtsov [Thu, 30 Mar 2017 14:51:37 +0000 (17:51 +0300)]
Raise bad_node instead of node_down for consistency reason

7 years agoDo not duplicate enc_pid/dec_pid functions
Evgeniy Khramtsov [Thu, 30 Mar 2017 14:44:43 +0000 (17:44 +0300)]
Do not duplicate enc_pid/dec_pid functions

7 years agoAdd missing jlib->aux convertion
Christophe Romain [Thu, 30 Mar 2017 12:28:55 +0000 (14:28 +0200)]
Add missing jlib->aux convertion

7 years agoRefactor pubsub's get_last_items
Christophe Romain [Thu, 30 Mar 2017 12:26:30 +0000 (14:26 +0200)]
Refactor pubsub's get_last_items

7 years agoDeprecate jlib.erl in favor of aux.erl
Evgeniy Khramtsov [Thu, 30 Mar 2017 11:17:13 +0000 (14:17 +0300)]
Deprecate jlib.erl in favor of aux.erl

Since the main goal of jlib.erl is lost, all auxiliary functions
are now moved to aux.erl, and the whole jlib.erl is now deprecated.

7 years agoMerge pull request #1646 from weiss/custom-headers
Christophe Romain [Thu, 30 Mar 2017 10:47:42 +0000 (12:47 +0200)]
Merge pull request #1646 from weiss/custom-headers

Add custom_headers option for ejabberd_http listeners

7 years agoAdd Redis as mod_carboncopy RAM backend
Evgeniy Khramtsov [Thu, 30 Mar 2017 08:45:09 +0000 (11:45 +0300)]
Add Redis as mod_carboncopy RAM backend

7 years agoAdd SQL as mod_carboncopy RAM backend
Evgeniy Khramtsov [Thu, 30 Mar 2017 07:31:51 +0000 (10:31 +0300)]
Add SQL as mod_carboncopy RAM backend

7 years agooauth_list_tokens and oauth_revoke_token work only in Mnesia (#1644)
Badlop [Wed, 29 Mar 2017 10:41:27 +0000 (12:41 +0200)]
oauth_list_tokens and oauth_revoke_token work only in Mnesia (#1644)

7 years agoFix a typo
Evgeniy Khramtsov [Wed, 29 Mar 2017 10:20:15 +0000 (13:20 +0300)]
Fix a typo

7 years agoAdd SQL as mod_muc RAM backend
Evgeniy Khramtsov [Wed, 29 Mar 2017 09:58:01 +0000 (12:58 +0300)]
Add SQL as mod_muc RAM backend

7 years agoAdd Redis as mod_bosh RAM backend
Evgeniy Khramtsov [Tue, 28 Mar 2017 18:12:26 +0000 (21:12 +0300)]
Add Redis as mod_bosh RAM backend

7 years agoAdd SQL as mod_bosh RAM backend
Evgeniy Khramtsov [Tue, 28 Mar 2017 17:33:57 +0000 (20:33 +0300)]
Add SQL as mod_bosh RAM backend

7 years agoAdd Redis as router RAM backend
Evgeniy Khramtsov [Tue, 28 Mar 2017 16:34:04 +0000 (19:34 +0300)]
Add Redis as router RAM backend

7 years agoMix needs include path to p1_utils
Christophe Romain [Tue, 28 Mar 2017 14:08:10 +0000 (16:08 +0200)]
Mix needs include path to p1_utils

7 years agoAdd SQL as router RAM backend
Evgeniy Khramtsov [Tue, 28 Mar 2017 13:31:37 +0000 (16:31 +0300)]
Add SQL as router RAM backend

7 years agomod_http_upload: Don't add "Server" header line
Holger Weiss [Mon, 27 Mar 2017 22:03:17 +0000 (00:03 +0200)]
mod_http_upload: Don't add "Server" header line

Administrators can add the "Server" header line using the new listener
option "custom_headers", if desired.

7 years agoejabberd_http: Expand @VERSION@ in custom headers
Holger Weiss [Mon, 27 Mar 2017 21:52:49 +0000 (23:52 +0200)]
ejabberd_http: Expand @VERSION@ in custom headers

Let ejabberd_http expand the @VERSION@ keyword to the ejabberd version
if specified in the "custom_headers" listener option.

Closes #1414.

7 years agoejabberd_http: Add "custom_headers" option
Holger Weiss [Mon, 27 Mar 2017 21:19:11 +0000 (23:19 +0200)]
ejabberd_http: Add "custom_headers" option

If the new listener option "custom_headers" is specified, include those
headers with the HTTP(S) response.

Closes #517.

7 years agoFix PEP issues (#1636)
Christophe Romain [Mon, 27 Mar 2017 14:24:24 +0000 (16:24 +0200)]
Fix PEP issues (#1636)

7 years agoMerge branch 'new_queue'
Evgeniy Khramtsov [Fri, 24 Mar 2017 10:27:56 +0000 (13:27 +0300)]
Merge branch 'new_queue'

Conflicts:
rebar.config
src/mod_muc_admin.erl

7 years agoAvoid PID collisions 17.03
Evgeniy Khramtsov [Fri, 24 Mar 2017 08:03:23 +0000 (11:03 +0300)]
Avoid PID collisions

Fixes #1470

7 years agoAdd inets in included_application for mix
Christophe Romain [Thu, 23 Mar 2017 11:20:02 +0000 (12:20 +0100)]
Add inets in included_application for mix

7 years agoExpand ejabberd.yml.example by enabling mod_http_api with couple commands
Paweł Chmielowski [Wed, 22 Mar 2017 13:30:04 +0000 (14:30 +0100)]
Expand ejabberd.yml.example by enabling mod_http_api with couple commands

7 years agoUpdate mix dependencies
Christophe Romain [Wed, 22 Mar 2017 10:59:39 +0000 (11:59 +0100)]
Update mix dependencies

7 years agoUpdate dependencies
Christophe Romain [Wed, 22 Mar 2017 09:06:21 +0000 (10:06 +0100)]
Update dependencies

7 years agoUpdate docker files from latest Rafael's changes
Christophe Romain [Tue, 21 Mar 2017 17:59:12 +0000 (18:59 +0100)]
Update docker files from latest Rafael's changes

7 years agoprosody2ejabberd: Fix offline message record type
Holger Weiss [Tue, 21 Mar 2017 17:35:07 +0000 (18:35 +0100)]
prosody2ejabberd: Fix offline message record type

mod_offline now expects a #message{} rather than an #xmlel{} record.

7 years agoprosody2ejabberd: Fix message attribute removal
Holger Weiss [Tue, 21 Mar 2017 17:23:55 +0000 (18:23 +0100)]
prosody2ejabberd: Fix message attribute removal

Actually remove the 'stamp' and 'stamp_legacy' attributes from imported
offline messages as intended.

7 years agoFix crash in mod_muc_admin, we operate on integers here not lists
Paweł Chmielowski [Tue, 21 Mar 2017 14:35:51 +0000 (15:35 +0100)]
Fix crash in mod_muc_admin, we operate on integers here not lists

7 years agoDon't block contacts with subscription=to in mod_block_strangers (#1609)
Alexey Shchepin [Tue, 21 Mar 2017 12:42:24 +0000 (15:42 +0300)]
Don't block contacts with subscription=to in mod_block_strangers (#1609)

7 years agoUse item creation date in rsm order (#1516)
Christophe Romain [Tue, 21 Mar 2017 11:45:11 +0000 (12:45 +0100)]
Use item creation date in rsm order (#1516)

7 years agoMerge pull request #1626 from weiss/fix-scram-import
Evgeny Khramtsov [Tue, 21 Mar 2017 11:44:29 +0000 (15:44 +0400)]
Merge pull request #1626 from weiss/fix-scram-import

prosody2ejabberd: Fix SCRAM hash conversion

7 years agoReplace mod_http_bind by mod_bosh in config example
Christophe Romain [Tue, 21 Mar 2017 10:15:01 +0000 (11:15 +0100)]
Replace mod_http_bind by mod_bosh in config example

7 years agoRemove misleading sentence about s2s dialback
Evgeniy Khramtsov [Mon, 20 Mar 2017 18:48:31 +0000 (21:48 +0300)]
Remove misleading sentence about s2s dialback

7 years agoResolve vars.config relative to to rebar.config.script
Paweł Chmielowski [Mon, 20 Mar 2017 17:28:40 +0000 (18:28 +0100)]
Resolve vars.config relative to to rebar.config.script

This fixes problem with missing deps in make rel - issue #1615

7 years agoFix compilation with mix (#1588)
Christophe Romain [Mon, 20 Mar 2017 15:58:48 +0000 (16:58 +0100)]
Fix compilation with mix (#1588)

7 years agoUpdate mix deps
Christophe Romain [Mon, 20 Mar 2017 15:26:16 +0000 (16:26 +0100)]
Update mix deps

7 years agoUpdate xmpp and fast_tls versions
Christophe Romain [Mon, 20 Mar 2017 14:33:55 +0000 (15:33 +0100)]
Update xmpp and fast_tls versions

7 years agoRevert "Bump OTP version to 19.3 in Travis config"
Evgeniy Khramtsov [Mon, 20 Mar 2017 11:08:58 +0000 (14:08 +0300)]
Revert "Bump OTP version to 19.3 in Travis config"

This reverts commit 7113f2b8ba73f4f565dd1ce6c482c9f03d2b0858.

7 years agoBump OTP version to 19.3 in Travis config
Evgeniy Khramtsov [Mon, 20 Mar 2017 10:49:23 +0000 (13:49 +0300)]
Bump OTP version to 19.3 in Travis config

7 years agoRemove webtool from erlang.plt creation
Evgeniy Khramtsov [Mon, 20 Mar 2017 10:48:17 +0000 (13:48 +0300)]
Remove webtool from erlang.plt creation

7 years agoUse new xdata compiler API
Evgeniy Khramtsov [Mon, 20 Mar 2017 06:57:11 +0000 (09:57 +0300)]
Use new xdata compiler API

7 years agoBetter log s2s auth failures when TLS is not available
Evgeniy Khramtsov [Sat, 18 Mar 2017 10:59:24 +0000 (13:59 +0300)]
Better log s2s auth failures when TLS is not available

7 years agoLog startup time
Evgeniy Khramtsov [Sat, 18 Mar 2017 07:24:42 +0000 (10:24 +0300)]
Log startup time

7 years agoMerge pull request #1617 from edwardchow33/patch-1
Evgeny Khramtsov [Fri, 17 Mar 2017 22:40:14 +0000 (02:40 +0400)]
Merge pull request #1617 from edwardchow33/patch-1

Fix wrong parameter values in mod_muc_admin

7 years agoFixed wrong parameter values in mod_muc_admin
Edward Chow [Fri, 17 Mar 2017 19:07:23 +0000 (03:07 +0800)]
Fixed wrong parameter values in mod_muc_admin

Corrected wrong parameter values passing to register_online_room(Room, Host, Pid) of mod_muc

7 years agoSet translation callback on startup
Evgeniy Khramtsov [Fri, 17 Mar 2017 18:35:02 +0000 (21:35 +0300)]
Set translation callback on startup

7 years agoTeach mod_http_fileserver ability to send 304 Not Modified
Paweł Chmielowski [Fri, 17 Mar 2017 10:58:32 +0000 (11:58 +0100)]
Teach mod_http_fileserver ability to send 304 Not Modified

7 years agoprosody2ejabberd: Fix SCRAM hash conversion
Holger Weiss [Thu, 16 Mar 2017 22:15:08 +0000 (23:15 +0100)]
prosody2ejabberd: Fix SCRAM hash conversion

Closes #1549.

7 years agoEncode in base64 when getting scram data with import_prosody (#1549)
Badlop [Wed, 15 Mar 2017 10:42:16 +0000 (11:42 +0100)]
Encode in base64 when getting scram data with import_prosody (#1549)

7 years agoUse correct pid when registering local route
Evgeniy Khramtsov [Wed, 15 Mar 2017 07:27:22 +0000 (10:27 +0300)]
Use correct pid when registering local route

This fixes #1600

7 years agoUpdate cyrsasl_oauth to internal API changes
Alexey Shchepin [Tue, 14 Mar 2017 14:25:09 +0000 (17:25 +0300)]
Update cyrsasl_oauth to internal API changes

7 years agoGet rid of p1_sha calls
Alexey Shchepin [Mon, 13 Mar 2017 23:31:51 +0000 (02:31 +0300)]
Get rid of p1_sha calls