Merge pull request #3111 from emqx/issue#3109

Fix issue#3109 - remove the 'sessions.persistent.count', 'sessions.persistent.max' stats

src/emqx_stats.erl

@@ -66,22 +66,26 @@
 -type(stats() :: list({atom(), non_neg_integer()})).
 
 %% Connection stats
--define(CONNECTION_STATS, [
+-define(CONNECTION_STATS,
-    'connections.count', % current connections
+        ['connections.count', %% Count of Concurrent Connections
-    'connections.max'    % maximum connections connected
+         'connections.max'    %% Maximum Number of Concurrent Connections
-]).
+        ]).
+
+%% Channel stats
+-define(CHANNEL_STATS,
+        ['channels.count', %% Count of Concurrent Channels
+         'channels.max'    %% Maximum Number of Concurrent Channels
+        ]).
 
 %% Session stats
--define(SESSION_STATS, [
+-define(SESSION_STATS,
-    'sessions.count',
+        ['sessions.count', %% Count of Concurrent Sessions
-    'sessions.max',
+         'sessions.max'    %% Maximum Number of Concurrent Sessions
-    'sessions.persistent.count',
+        ]).
-    'sessions.persistent.max'
-]).
 
-%% Subscribers, Subscriptions stats
+%% PubSub stats
--define(PUBSUB_STATS, [
+-define(PUBSUB_STATS,
-    'topics.count',
+        ['topics.count',
          'topics.max',
          'suboptions.count',
          'suboptions.max',
@@ -91,23 +95,24 @@
          'subscriptions.max',
          'subscriptions.shared.count',
          'subscriptions.shared.max'
-]).
+        ]).
 
--define(ROUTE_STATS, [
+%% Route stats
-    'routes.count',
+-define(ROUTE_STATS,
+        ['routes.count',
          'routes.max'
-]).
+        ]).
 
 %% Retained stats
--define(RETAINED_STATS, [
+-define(RETAINED_STATS,
-    'retained.count',
+        ['retained.count',
          'retained.max'
-]).
+        ]).
 
 -define(TAB, ?MODULE).
 -define(SERVER, ?MODULE).
 
--type opts() :: #{tick_ms := timeout()}.
+-type(opts() :: #{tick_ms := timeout()}).
 
 %% @doc Start stats server
 -spec(start_link() -> startlink_ret()).
@@ -122,7 +127,7 @@ start_link(Opts) ->
 stop() ->
     gen_server:call(?SERVER, stop, infinity).
 
-%% @doc Generate stats fun
+%% @doc Generate stats fun.
 -spec(statsfun(Stat :: atom()) -> fun()).
 statsfun(Stat) ->
     fun(Val) -> setstat(Stat, Val) end.
@@ -131,7 +136,7 @@ statsfun(Stat) ->
 statsfun(Stat, MaxStat) ->
     fun(Val) -> setstat(Stat, MaxStat, Val) end.
 
-%% @doc Get all statistics
+%% @doc Get all statistics.
 -spec(getstats() -> stats()).
 getstats() ->
     case ets:info(?TAB, name) of
@@ -139,7 +144,7 @@ getstats() ->
         _ -> ets:tab2list(?TAB)
     end.
 
-%% @doc Get stats by name
+%% @doc Get stats by name.
 -spec(getstat(atom()) -> maybe(non_neg_integer())).
 getstat(Name) ->
     case ets:lookup(?TAB, Name) of
@@ -173,8 +178,7 @@ cancel_update(Name) ->
 rec(Name, Secs, UpFun) ->
     #update{name = Name, countdown = Secs, interval = Secs, func = UpFun}.
 
-cast(Msg) ->
+cast(Msg) -> gen_server:cast(?SERVER, Msg).
-    gen_server:cast(?SERVER, Msg).
 
 %%--------------------------------------------------------------------
 %% gen_server callbacks
@@ -182,8 +186,13 @@ cast(Msg) ->
 
 init(#{tick_ms := TickMs}) ->
     ok = emqx_tables:new(?TAB, [public, set, {write_concurrency, true}]),
-    Stats = lists:append([?CONNECTION_STATS, ?SESSION_STATS, ?PUBSUB_STATS,
+    Stats = lists:append([?CONNECTION_STATS,
-                          ?ROUTE_STATS, ?RETAINED_STATS]),
+                          ?CHANNEL_STATS,
+                          ?SESSION_STATS,
+                          ?PUBSUB_STATS,
+                          ?ROUTE_STATS,
+                          ?RETAINED_STATS
+                         ]),
     true = ets:insert(?TAB, [{Name, 0} || Name <- Stats]),
     {ok, start_timer(#state{updates = [], tick_ms = TickMs}), hibernate}.
 
@@ -211,16 +220,17 @@ handle_cast({setstat, Stat, MaxStat, Val}, State) ->
 
 handle_cast({update_interval, Update = #update{name = Name}},
             State = #state{updates = Updates}) ->
-    case lists:keyfind(Name, #update.name, Updates) of
+    NState = case lists:keyfind(Name, #update.name, Updates) of
                  #update{} ->
                      ?LOG(warning, "Duplicated update: ~s", [Name]),
-            {noreply, State};
+                     State;
-        false ->
+                 false -> State#state{updates = [Update|Updates]}
-            {noreply, State#state{updates = [Update | Updates]}}
+             end,
-    end;
+    {noreply, NState};
 
 handle_cast({cancel_update, Name}, State = #state{updates = Updates}) ->
-    {noreply, State#state{updates = lists:keydelete(Name, #update.name, Updates)}};
+    Updates1 = lists:keydelete(Name, #update.name, Updates),
+    {noreply, State#state{updates = Updates1}};
 
 handle_cast(Msg, State) ->
     ?LOG(error, "Unexpected cast: ~p", [Msg]),
@@ -233,7 +243,7 @@ handle_info({timeout, TRef, tick}, State = #state{timer = TRef, updates = Update
                          try UpFun()
                          catch
                              _:Error ->
-                                 ?LOG(error, "update ~s failed: ~p", [Name, Error])
+                                 ?LOG(error, "Update ~s failed: ~p", [Name, Error])
                          end,
                          [Update#update{countdown = I} | Acc];
                     (Update = #update{countdown = C}, Acc) ->
@@ -259,10 +269,9 @@ safe_update_element(Key, Val) ->
     try ets:update_element(?TAB, Key, {2, Val}) of
         false ->
             ets:insert_new(?TAB, {Key, Val});
-        true ->
+        true -> true
-            true
     catch
         error:badarg ->
-            ?LOG(warning, "Update ~p to ~p failed", [Key, Val])
+            ?LOG(warning, "Failed to update ~p to ~p", [Key, Val])
     end.