25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-08 15:42:29 +01:00
Commit Graph

2740 Commits

Author SHA1 Message Date
Pablo Polvorin
1babae067d Persist muc history on DB on server shutdown (EJABS-1733).
Ejabberd can be configured to store recent history of MUCs
to DB before shutdown. On restart, those messages are
retrieved from storage.

To enable it, set {persist_history, true} in mod_muc configuration,
ej:
  {mod_muc,      [
                  %%{host, "conference.@HOST@"},
                  {access, muc},
                  {access_create, muc_create},
                  {access_persistent, muc_create},
                  {access_admin, muc_admin},
                  {persist_history, true}
                 ]},

Messages are only stored on server shutdown, not on the fly.

$ejabberdctl stop
or
init:stop()
inside a debug console works.

Note: Only rooms configured as "persistent" will save messages
      (as other rooms doesn't survive server restart anyway).

Limitations: There is no option to store messages on mnesia, you *must*
     use a ODBC database.  Only tested with mysql.

Check odbc/mysql.sql  for the definition of the table "room_history",
the one needed for this.
2011-09-24 18:39:03 -03:00
Pablo Polvorin
3ae4797848 Command to moderate short term muc history (part of EJABS-1733)
ejabberdctl moderate_room_history test@conference.domain.com nick

removes from short term storage all messages on
room test@conference.domain.com from nick "nick", so new user
joining the room don't get these ones.

Return the number of messages removed.
2011-09-19 15:43:20 -03:00
Evgeniy Khramtsov
86f0a9790d Do not crash on sync_send_all_state_event errors (part of EJABS-1708) 2011-09-16 16:44:24 +10:00
Evgeniy Khramtsov
54acf9bde4 Do not send <success/> twice when SCRAM-SHA-1 is used.
This is a merge bug actually
2011-09-15 19:24:41 +10:00
Evgeniy Khramtsov
8f27a697c0 Only use hash route-balancing when MUC is broadcasted 2011-09-15 08:52:22 +10:00
Evgeniy Khramtsov
c9a712a16a Implement MUC rooms load distribution (TECH-1351).
Configuration example:
{domain_balancing, "conference.domain.com", broadcast}.
NOTE: both ejabberd_router and mod_muc use the option.
2011-09-14 17:43:07 +10:00
Evgeniy Khramtsov
d6e81ac06b Add new domain_balancing criteria: broadcast 2011-09-14 17:40:06 +10:00
Evgeniy Khramtsov
b0b371d23a Get rid of useless function clause 2011-09-05 15:06:43 +10:00
Badlop
dd772404c5 Merge branch '2.1.x' into 2.2.x
Conflicts:
	src/configure
	src/ejabberd.app
	src/ejabberd_auth_anonymous.erl
	src/ejabberd_c2s.erl
	src/ejabberd_sm.erl
2011-08-24 18:29:25 +02:00
Badlop
84486dcb2c Support multiple sessions per nick in muc_online_users, relevant for max_user_conferences (EJAB-305) 2011-08-23 21:53:41 +02:00
Badlop
9a190f3bc4 Send private messages to all the sessions with same nick (EJAB-305) 2011-08-23 21:53:30 +02:00
Badlop
c76bbdf16f Don't send unavailable presence when leaving occupant has other nicks in the room (EJAB-305) 2011-08-23 21:53:19 +02:00
Badlop
24c5063b99 Allow multiple entry with same nick to MUC rooms (thanks to Magnus Henoch)(EJAB-305) 2011-08-23 21:52:20 +02:00
Pablo Polvorin
bed5e80ef9 Merge commit '78f50c5' into 2.2.x 2011-08-17 15:23:16 -03:00
Badlop
a0f8a2c3a4 New option resource_conflict defines server action (thanks to Lee Boynton)(EJAB-650) 2011-08-17 19:44:39 +02:00
Badlop
3edea6c806 Fix bug in scram is_alpha 2011-08-17 19:33:58 +02:00
Christophe Romain
9ccdb5d78b fix set_configure with odbc backend (thanks to Karim Gemayel) 2011-08-17 16:18:32 +02:00
Badlop
abebabc487 Fix ODBC account counting (thanks to Artem Sh)(EJAB-1491) 2011-08-16 19:33:22 +02:00
Badlop
1ee6eae684 Fix and improve support for SCRAM auth method (EJAB-1196) 2011-08-16 00:26:49 +02:00
Badlop
24852b9be8 Indicate license and copyright (thanks to Stephen Röttger)(EJAB-1196) 2011-08-16 00:25:40 +02:00
Badlop
e80b92b481 Preliminary patch for SASL SCRAM-SHA-1 (thanks to Stephen Röttger)(EJAB-1196) 2011-08-16 00:25:03 +02:00
Evgeniy Khramtsov
5bef1a8f77 Now it is possible to migrate C2S/BOSH/MUC sessions.
Example usage:
$ ejabberdctl stop_migrate 30
This will migrate c2s/bosh/muc processes smoothly within 30 seconds and stop ejabberd.

The commit also resolves EJABS-1661
2011-08-13 19:05:21 +10:00
Evgeniy Khramtsov
4f1637fa40 Implement BOSH session migration 2011-08-12 23:48:39 +10:00
Pablo Polvorin
573a84b2ec handle case when roster version on DB is enabled but version is not found.
Thanks Evgeniy.
2011-08-05 12:21:24 -03:00
Evgeniy Khramtsov
796cb6634b Get rid of sync call in send/2, process send_xml/2 failure gracefully 2011-08-05 18:10:56 +10:00
Evgeniy Khramtsov
bb5480756a Get rid of "ip" state value 2011-08-05 18:04:01 +10:00
Evgeniy Khramtsov
edb030f49a Get rid of "socket" state value 2011-08-05 17:58:02 +10:00
Evgeniy Khramtsov
0ed4ceebea Complete API functions 2011-08-05 17:52:49 +10:00
Evgeniy Khramtsov
31f7eadfca Use ?GEN_FSM macro whenever possible 2011-08-05 17:02:47 +10:00
Evgeniy Khramtsov
1c72c45404 Add shaper support 2011-08-05 15:53:57 +10:00
Badlop
75f8e174dc Add comment about ping requests sent even to non-supporting clients 2011-08-04 18:29:13 +02:00
Evgeniy Khramtsov
f8fd9969e1 Return valid "inactivity" in session creation response 2011-07-28 16:39:17 +10:00
Evgeniy Khramtsov
8d09655a89 Reply on stream:start immediately if XMPP version is lower than 1.0 2011-07-28 16:31:10 +10:00
Evgeniy Khramtsov
a06b627631 Fix try/catch branch 2011-07-28 16:04:02 +10:00
Badlop
e690afc33b Verify username provided in registration web form 2011-07-27 12:25:51 +02:00
Badlop
493b664f19 Handle case when ejabberd_auth_* says the account exists 2011-07-27 11:44:35 +02:00
Evgeniy Khramtsov
cb41c8ef80 Make work with buffers more abstract 2011-07-27 13:14:10 +10:00
Evgeniy Khramtsov
d4cea0f78f Fix possible function clause 2011-07-27 12:12:44 +10:00
Evgeniy Khramtsov
4d20abd7b6 Process max_inactivity and max_pause config options 2011-07-26 21:44:35 +10:00
Evgeniy Khramtsov
351ad528f9 Prebind support 2011-07-26 19:27:54 +10:00
Evgeniy Khramtsov
006da5589e Fix copyright header 2011-07-26 16:24:21 +10:00
Evgeniy Khramtsov
5f32dd3959 Use HTTP reason phrase to describe terminal binding errors 2011-07-26 16:19:04 +10:00
Evgeniy Khramtsov
a9269df2aa Fix inactivity timer processing 2011-07-26 15:15:17 +10:00
Evgeniy Khramtsov
a7d82d6ecb New BOSH implementation 2011-07-25 23:53:33 +10:00
Evgeniy Khramtsov
5b10b58c9f Do not hash s2s connections 2011-07-22 19:48:22 +10:00
Christophe Romain
ae24f7d787 send publish hook only on success, with broadcast stanza 2011-07-18 12:26:43 +02:00
Badlop
83014fb77b Include status 110 in presence to new occupant (EJAB-740) 2011-07-16 19:35:59 +02:00
Mickaël Rémond
1dfd9fd568 Merge branch '2.2.x' of git+ssh://gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers into 2.2.x 2011-07-15 20:21:13 +02:00
Mickaël Rémond
f655ab2ffc Allow to dump a specific user session 2011-07-15 20:20:56 +02:00
Badlop
1a4722e909 Fix typo in modules overview 2011-07-15 02:53:32 +02:00