From 11bdcf101754dc0cee14c5972e6921b3600d88df Mon Sep 17 00:00:00 2001 From: Feng Date: Thu, 10 Dec 2015 15:55:24 +0800 Subject: [PATCH 1/7] fix already_exists --- src/emqttd_mnesia.erl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/emqttd_mnesia.erl b/src/emqttd_mnesia.erl index 7c86b6086..531913602 100644 --- a/src/emqttd_mnesia.erl +++ b/src/emqttd_mnesia.erl @@ -91,6 +91,7 @@ create_table(Table, Attrs) -> case mnesia:create_table(Table, Attrs) of {atomic, ok} -> ok; {aborted, {already_exists, Table}} -> ok; + {aborted, {already_exists, Table, _}} -> ok; Error -> Error end. @@ -107,6 +108,7 @@ copy_tables() -> copy_table(Table) -> case mnesia:add_table_copy(Table, node(), ram_copies) of {atomic, ok} -> ok; + {aborted, {already_exists, Table}} -> ok; {aborted, {already_exists, Table, _Node}} -> ok; {aborted, Error} -> Error end. From c35d56df14287e105b535d5afed5b0a1c692189b Mon Sep 17 00:00:00 2001 From: Feng Date: Thu, 10 Dec 2015 16:03:29 +0800 Subject: [PATCH 2/7] update dashboard, stomp --- plugins/emqttd_dashboard | 2 +- plugins/emqttd_stomp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/emqttd_dashboard b/plugins/emqttd_dashboard index 6abc2642d..3baf7809a 160000 --- a/plugins/emqttd_dashboard +++ b/plugins/emqttd_dashboard @@ -1 +1 @@ -Subproject commit 6abc2642de542966ca0c91e5b563c412ee327031 +Subproject commit 3baf7809a6ae9162ec312e91ce99982beb1c3bc9 diff --git a/plugins/emqttd_stomp b/plugins/emqttd_stomp index 8259afcaa..586e7c170 160000 --- a/plugins/emqttd_stomp +++ b/plugins/emqttd_stomp @@ -1 +1 @@ -Subproject commit 8259afcaa1ad223850d2761d1b06cf92b351c576 +Subproject commit 586e7c170abb95a28a181827b9c308f896f68c93 From dec15c68d98e906b67f15be381cf46142f36d38d Mon Sep 17 00:00:00 2001 From: Feng Date: Thu, 10 Dec 2015 16:21:40 +0800 Subject: [PATCH 3/7] retainer, serialize --- test/{emqttd_retained_tests.erl => emqttd_retainer_tests.erl} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/{emqttd_retained_tests.erl => emqttd_retainer_tests.erl} (100%) diff --git a/test/emqttd_retained_tests.erl b/test/emqttd_retainer_tests.erl similarity index 100% rename from test/emqttd_retained_tests.erl rename to test/emqttd_retainer_tests.erl From ea45e45f286d0792f315d9a1e8400a6daf412adb Mon Sep 17 00:00:00 2001 From: Feng Date: Thu, 10 Dec 2015 16:21:53 +0800 Subject: [PATCH 4/7] retainer, serialize --- test/emqttd_retainer_tests.erl | 4 +-- test/emqttd_serializer_tests.erl | 50 ++++++++++++++++---------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/test/emqttd_retainer_tests.erl b/test/emqttd_retainer_tests.erl index b541a0731..6bd013185 100644 --- a/test/emqttd_retainer_tests.erl +++ b/test/emqttd_retainer_tests.erl @@ -1,4 +1,4 @@ --module(emqttd_retained_tests). +-module(emqttd_retainer_tests). -include("emqttd.hrl"). @@ -8,7 +8,7 @@ retain_test() -> mnesia:start(), - emqttd_retained:mnesia(boot), + emqttd_retainer:mnesia(boot), mnesia:stop(). -endif. diff --git a/test/emqttd_serializer_tests.erl b/test/emqttd_serializer_tests.erl index b4cacf0ec..02bebc6af 100644 --- a/test/emqttd_serializer_tests.erl +++ b/test/emqttd_serializer_tests.erl @@ -34,45 +34,45 @@ -import(emqttd_serializer, [serialize/1]). -serilize_connect_test() -> - serilize(?CONNECT_PACKET(#mqtt_packet_connect{})). +serialize_connect_test() -> + serialize(?CONNECT_PACKET(#mqtt_packet_connect{})). -serilize_connack_test() -> +serialize_connack_test() -> ConnAck = #mqtt_packet{header = #mqtt_packet_header{type = ?CONNACK}, variable = #mqtt_packet_connack{ack_flags = 0, return_code = 0}}, - ?assertEqual(<<32,2,0,0>>, serilize(ConnAck)). + ?assertEqual(<<32,2,0,0>>, serialize(ConnAck)). -serilize_publish_test() -> - serilize(?PUBLISH_PACKET(?QOS_0, <<"Topic">>, undefined, <<"Payload">>)), - serilize(?PUBLISH_PACKET(?QOS_1, <<"Topic">>, 938, <<"Payload">>)). +serialize_publish_test() -> + serialize(?PUBLISH_PACKET(?QOS_0, <<"Topic">>, undefined, <<"Payload">>)), + serialize(?PUBLISH_PACKET(?QOS_1, <<"Topic">>, 938, <<"Payload">>)). -serilize_puback_test() -> - serilize(?PUBACK_PACKET(?PUBACK, 10384)). +serialize_puback_test() -> + serialize(?PUBACK_PACKET(?PUBACK, 10384)). -serilize_pubrel_test() -> - serilize(?PUBREL_PACKET(10384)). +serialize_pubrel_test() -> + serialize(?PUBREL_PACKET(10384)). -serilize_subscribe_test() -> +serialize_subscribe_test() -> TopicTable = [{<<"TopicQos0">>, ?QOS_0}, {<<"TopicQos1">>, ?QOS_1}, {<<"TopicQos2">>, ?QOS_2}], - serilize(?SUBSCRIBE_PACKET(10, TopicTable)). + serialize(?SUBSCRIBE_PACKET(10, TopicTable)). -serilize_suback_test() -> - serilize(?SUBACK_PACKET(10, [?QOS_0, ?QOS_1, 128])). +serialize_suback_test() -> + serialize(?SUBACK_PACKET(10, [?QOS_0, ?QOS_1, 128])). -serilize_unsubscribe_test() -> - serilize(?UNSUBSCRIBE_PACKET(10, [<<"Topic1">>, <<"Topic2">>])). +serialize_unsubscribe_test() -> + serialize(?UNSUBSCRIBE_PACKET(10, [<<"Topic1">>, <<"Topic2">>])). -serilize_unsuback_test() -> - serilize(?UNSUBACK_PACKET(10)). +serialize_unsuback_test() -> + serialize(?UNSUBACK_PACKET(10)). -serilize_pingreq_test() -> - serilize(?PACKET(?PINGREQ)). +serialize_pingreq_test() -> + serialize(?PACKET(?PINGREQ)). -serilize_pingresp_test() -> - serilize(?PACKET(?PINGRESP)). +serialize_pingresp_test() -> + serialize(?PACKET(?PINGRESP)). -serilize_disconnect_test() -> - serilize(?PACKET(?DISCONNECT)). +serialize_disconnect_test() -> + serialize(?PACKET(?DISCONNECT)). -endif. From ab556b6bda4f6d51c7ffcdd21238c4f11711923f Mon Sep 17 00:00:00 2001 From: Feng Date: Thu, 10 Dec 2015 16:49:58 +0800 Subject: [PATCH 5/7] rm subscriptions from sess_info --- src/emqttd_session.erl | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/emqttd_session.erl b/src/emqttd_session.erl index 1049a8173..e2606ae5d 100644 --- a/src/emqttd_session.erl +++ b/src/emqttd_session.erl @@ -722,7 +722,6 @@ start_collector(Session = #session{collect_interval = Interval}) -> Session#session{collect_timer = TRef}. sess_info(#session{clean_sess = CleanSess, - subscriptions = Subscriptions, inflight_queue = InflightQueue, max_inflight = MaxInflight, message_queue = MessageQueue, @@ -732,7 +731,6 @@ sess_info(#session{clean_sess = CleanSess, timestamp = CreatedAt}) -> Stats = emqttd_mqueue:stats(MessageQueue), [{clean_sess, CleanSess}, - {subscriptions, dict:to_list(Subscriptions)}, {max_inflight, MaxInflight}, {inflight_queue, length(InflightQueue)}, {message_queue, proplists:get_value(len, Stats)}, From f4574c72dc4f8ddf36c97403e06ff7e0898f0a3b Mon Sep 17 00:00:00 2001 From: Feng Date: Thu, 10 Dec 2015 17:58:06 +0800 Subject: [PATCH 6/7] 0.14 --- plugins/emqttd_plugin_mysql | 2 +- plugins/emqttd_plugin_pgsql | 2 +- plugins/emqttd_recon | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/emqttd_plugin_mysql b/plugins/emqttd_plugin_mysql index e827b83ab..b77d336d1 160000 --- a/plugins/emqttd_plugin_mysql +++ b/plugins/emqttd_plugin_mysql @@ -1 +1 @@ -Subproject commit e827b83abacff66dc8c229f1cf79c667d65d646d +Subproject commit b77d336d1695a80c25f6f9005b3151662ab7ff0a diff --git a/plugins/emqttd_plugin_pgsql b/plugins/emqttd_plugin_pgsql index 956c38194..d115575d2 160000 --- a/plugins/emqttd_plugin_pgsql +++ b/plugins/emqttd_plugin_pgsql @@ -1 +1 @@ -Subproject commit 956c38194113825784103af2bc7bfbc2a762f55d +Subproject commit d115575d2bd78aa943cdaa3678db437ae897f4e9 diff --git a/plugins/emqttd_recon b/plugins/emqttd_recon index cd8c3a724..287b0329b 160000 --- a/plugins/emqttd_recon +++ b/plugins/emqttd_recon @@ -1 +1 @@ -Subproject commit cd8c3a72484a51c750f8e39812c5da4b8dd1cdae +Subproject commit 287b0329bbc9fcbcfe64c5b67cd837ec61b36868 From 8282ce5c09e212a5d5cfed9fa59ee741378fd2b9 Mon Sep 17 00:00:00 2001 From: Feng Date: Thu, 10 Dec 2015 18:01:22 +0800 Subject: [PATCH 7/7] 0.14 --- plugins/emqttd_dashboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/emqttd_dashboard b/plugins/emqttd_dashboard index 3baf7809a..beff7740b 160000 --- a/plugins/emqttd_dashboard +++ b/plugins/emqttd_dashboard @@ -1 +1 @@ -Subproject commit 3baf7809a6ae9162ec312e91ce99982beb1c3bc9 +Subproject commit beff7740b8f46647cece3c70abc11e1c055ad892