aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2007-12-06 15:40:21 +0000
committerBadlop <badlop@process-one.net>2007-12-06 15:40:21 +0000
commitfc8c92a23301ab7e18ff2ddb7a066477fde3d68d (patch)
tree27752f4249d3d32f249df6e8fc16ed195372f41b
parent* doc/Makefile: Remove bashism (now really committed) (diff)
* src/mod_muc/mod_muc.erl: Catch creation of table
muc_online_users: it may be already created by other mod_muc instance SVN Revision: 1036
-rw-r--r--ChangeLog4
-rw-r--r--src/mod_muc/mod_muc.erl5
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f55968581..f13014b13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-12-06 Badlop <badlop@process-one.net>
+ * src/mod_muc/mod_muc.erl: Catch creation of table
+ muc_online_users: it may be already created by other mod_muc
+ instance
+
* doc/Makefile: Remove bashism
* doc/guide.tex: Document how to change computer
diff --git a/src/mod_muc/mod_muc.erl b/src/mod_muc/mod_muc.erl
index 09061650a..fe315a616 100644
--- a/src/mod_muc/mod_muc.erl
+++ b/src/mod_muc/mod_muc.erl
@@ -149,10 +149,7 @@ init([Host, Opts]) ->
[{ram_copies, [node()]},
{attributes, record_info(fields, muc_online_room)}]),
mnesia:add_table_copy(muc_online_room, node(), ram_copies),
- ets:new(muc_online_users, [bag,
- named_table,
- public,
- {keypos, 2}]),
+ catch ets:new(muc_online_users, [bag, named_table, public, {keypos, 2}]),
MyHost = gen_mod:get_opt_host(Host, Opts, "conference.@HOST@"),
update_tables(MyHost),
clean_table_from_bad_node(node(), MyHost),