Merge branch 'master' into dev

README.md

@@ -75,7 +75,7 @@ cd emqttd && make && make dist
 
 ## GetStarted
 
-Read [emqtt wiki](https://github.com/emqtt/emqttd/wiki) for detaied installation and configuration guide.
+Read [emqtt wiki](https://github.com/emqtt/emqttd/wiki) for detailed installation and configuration guide.
 
 
 ## Benchmark

apps/emqttd/src/emqttd.erl

@@ -162,7 +162,7 @@ loaded_plugins() ->
 -spec unload_all_plugins() -> [{App :: atom(), ok | {error, any()}}].
 unload_all_plugins() ->
     PluginApps = application:get_env(emqttd, plugins, []),
-    [{App, unload_plugin(App)} || {App, _Env} <- PluginApps].
+    [{App, unload_plugin(App)} || App <- PluginApps].
 
 
 %%------------------------------------------------------------------------------

apps/emqttd/src/emqttd_app.erl

@@ -31,7 +31,7 @@
 -behaviour(application).
 
 %% Application callbacks
--export([start/2, stop/1]).
+-export([start/2, prep_stop/1, stop/1]).
 
 -define(PRINT_MSG(Msg), io:format(Msg)).
 
@@ -128,10 +128,16 @@ worker_spec(Name, Opts) ->
         {Name, start_link, [Opts]},
             permanent, 10000, worker, [Name]}.
 
--spec stop(State :: term()) -> term().
+%% close all listeners first...
-stop(_State) ->
+prep_stop(State) ->
+    %%TODO: esockd app should be running...
     {ok, Listeners} = application:get_env(listeners),
     emqttd:close_listeners(Listeners),
-    emqttd:unload_all_plugins(),
+    timer:sleep(2),
+    State.
+
+-spec stop(State :: term()) -> term().
+stop(_State) ->
     ok.
 
+

apps/emqttd/src/emqttd_ctl.erl

@@ -75,12 +75,21 @@ cluster([SNode]) ->
     Node = node_name(SNode),
     case net_adm:ping(Node) of
     pong ->
+        case emqttd:is_running(Node) of
+            true ->
+                %%TODO: should not unload here.
+                emqttd:unload_all_plugins(),
                 application:stop(emqttd),
                 application:stop(esockd),
+                application:stop(gproc),
                 emqttd_mnesia:cluster(Node),
+                application:start(gproc),
                 application:start(esockd),
                 application:start(emqttd),
                 ?PRINT("cluster with ~p successfully.~n", [Node]);
+            false ->
+                ?PRINT("emqttd is not running on ~p~n", [Node])
+        end;
     pang ->
         ?PRINT("failed to connect to ~p~n", [Node])
     end.

rel/files/acl.config

@@ -1,6 +1,6 @@
 %%%-----------------------------------------------------------------------------
 %% 
-%% [ACL Design](https://github.com/emqtt/emqttd/wiki/ACL-Design)
+%% [ACL](https://github.com/emqtt/emqttd/wiki/ACL)
 %% 
 %% -type who() :: all | binary() |
 %%               {ipaddr, esockd_access:cidr()} |