diff --git a/Makefile b/Makefile index 9d6c9088d..4778ebdbb 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PROJECT = emqttd PROJECT_DESCRIPTION = Erlang MQTT Broker -PROJECT_VERSION = 2.1.0 +PROJECT_VERSION = 2.1.1 DEPS = goldrush gproc lager esockd mochiweb pbkdf2 lager_syslog diff --git a/src/emqttd.app.src b/src/emqttd.app.src index ca2a561c2..2751c9784 100644 --- a/src/emqttd.app.src +++ b/src/emqttd.app.src @@ -1,6 +1,6 @@ {application, emqttd, [ {description, "Erlang MQTT Broker"}, - {vsn, "2.1.0"}, + {vsn, "2.1.1"}, {modules, []}, {registered, [emqttd_sup]}, {applications, [kernel,stdlib,gproc,lager,esockd,mochiweb,lager_syslog,pbkdf2]}, diff --git a/src/emqttd_bridge.erl b/src/emqttd_bridge.erl index a1dd34bcc..815ee38d9 100644 --- a/src/emqttd_bridge.erl +++ b/src/emqttd_bridge.erl @@ -37,7 +37,7 @@ -record(state, {pool, id, node, subtopic, - qos = ?QOS_2, + qos = ?QOS_0, topic_suffix = <<>>, topic_prefix = <<>>, mqueue :: emqttd_mqueue:mqueue(), @@ -74,7 +74,7 @@ init([Pool, Id, Node, Topic, Options]) -> true -> true = erlang:monitor_node(Node, true), Share = iolist_to_binary(["$bridge:", atom_to_list(Node), ":", Topic]), - emqttd:subscribe(Topic, self(), [local, {share, Share}]), + emqttd:subscribe(Topic, self(), [local, {share, Share}, {qos, ?QOS_0}]), State = parse_opts(Options, #state{node = Node, subtopic = Topic}), MQueue = emqttd_mqueue:new(qname(Node, Topic), [{max_len, State#state.max_queue_len}], diff --git a/src/emqttd_cli.erl b/src/emqttd_cli.erl index 54d462e65..dddf03470 100644 --- a/src/emqttd_cli.erl +++ b/src/emqttd_cli.erl @@ -553,10 +553,10 @@ print({ClientId, _ClientPid, _Persistent, SessInfo}) -> "deliver_msg=~w, enqueue_msg=~w, created_at=~w)~n", [ClientId | [format(Key, get_value(Key, Data)) || Key <- InfoKeys]]). -print(subscription, {Sub, Topic}) when is_pid(Sub) -> - ?PRINT("~p -> ~s~n", [Sub, Topic]); print(subscription, {Sub, {_Share, Topic}}) when is_pid(Sub) -> ?PRINT("~p -> ~s~n", [Sub, Topic]); +print(subscription, {Sub, Topic}) when is_pid(Sub) -> + ?PRINT("~p -> ~s~n", [Sub, Topic]); print(subscription, {Sub, {_Share, Topic}}) -> ?PRINT("~s -> ~s~n", [Sub, Topic]); print(subscription, {Sub, Topic}) -> diff --git a/src/emqttd_http.erl b/src/emqttd_http.erl index 692477447..25b7c3d23 100644 --- a/src/emqttd_http.erl +++ b/src/emqttd_http.erl @@ -31,7 +31,7 @@ handle_request(Req) -> handle_request(Req:get(method), Req:get(path), Req). -handle_request('GET', "/status", Req) -> +handle_request(Method, "/status", Req) when Method =:= 'HEAD'; Method =:= 'GET' -> {InternalStatus, _ProvidedStatus} = init:get_status(), AppStatus = case lists:keysearch(emqttd, 1, application:which_applications()) of