Separate db trimming to a dedicated process

Author: gotthardp

.gitignore

@@ -14,4 +14,6 @@ priv/admin/angular-simple-logger.min.js
 priv/admin/ng-google-chart.min.js
 priv/admin/ng-admin.min.css
 priv/admin/ng-admin.min.js
+priv/admin/bootstrap-colorpicker-module.min.js
+priv/admin/colorpicker.min.css
 log/

lorawan_server.config

@@ -31,7 +31,7 @@
     % see https://github.com/erlang-lager/lager#overload-protection
     % {error_logger_hwm, undefined},
     {handlers, [
-        % {lager_console_backend, debug},
+        % {lager_console_backend, [{level, debug}]},
         {lager_file_backend, [{file, "log/debug.log"}, {level, debug}]},
         {lager_file_backend, [{file, "log/error.log"}, {level, error}]}
     ]}

src/lorawan_app.erl

@@ -19,7 +19,6 @@ start(_Type, _Args) ->
     ok = ensure_erlang_version(19),
     lorawan_db:ensure_tables(),
     syn:init(),
-    {ok, _} = timer:apply_interval(3600*1000, lorawan_db, trim_tables, []),
 
     {ok, Handlers} = lorawan_handler:init(),
     Dispatch = cowboy_router:compile([

src/lorawan_db.erl

@@ -5,8 +5,8 @@
 %
 -module(lorawan_db).
 
--export([ensure_tables/0, ensure_table/2, trim_tables/0]).
--export([get_rxframes/1, purge_txframes/1]).
+-export([ensure_tables/0, ensure_table/2]).
+-export([get_rxframes/1, get_last_rxframes/2]).
 
 -include_lib("lorawan_server_api/include/lorawan_application.hrl").
 -include("lorawan.hrl").
@@ -141,9 +141,6 @@ set_defaults(users) ->
 set_defaults(_Else) ->
     ok.
 
-trim_tables() ->
-    [trim_rxframes(R) || R <- mnesia:dirty_all_keys(links)],
-    [mnesia:dirty_delete(events, E) || E <- expired_events()].
 
 get_rxframes(DevAddr) ->
     {_, Frames} = get_last_rxframes(DevAddr, 50),
@@ -157,6 +154,9 @@ get_rxframes(DevAddr) ->
             Frames
     end.
 
+occured_rxframe_after(StartDate, #rxframe{datetime = FrameDate}) ->
+    StartDate =< FrameDate.
+
 get_last_rxframes(DevAddr, Count) ->
     Rec = mnesia:dirty_index_read(rxframes, DevAddr, #rxframe.devaddr),
     SRec = lists:sort(fun(#rxframe{frid = A}, #rxframe{frid = B}) -> A < B end, Rec),
@@ -166,32 +166,4 @@ get_last_rxframes(DevAddr, Count) ->
         true -> {[], SRec}
     end.
 
-occured_rxframe_after(StartDate, #rxframe{datetime = FrameDate}) ->
-    StartDate =< FrameDate.
-
-trim_rxframes(DevAddr) ->
-    {ok, Count} = application:get_env(lorawan_server, retained_rxframes),
-    case get_last_rxframes(DevAddr, Count) of
-        {[], _} ->
-            ok;
-        {ExpRec, _} ->
-            lager:debug("Expired ~w rxframes from ~w", [length(ExpRec), DevAddr]),
-            lists:foreach(fun(R) -> mnesia:dirty_delete_object(rxframes, R) end,
-                ExpRec)
-    end.
-
-expired_events() ->
-    {ok, AgeSeconds} = application:get_env(lorawan_server, event_lifetime),
-    ETime = calendar:gregorian_seconds_to_datetime(
-        calendar:datetime_to_gregorian_seconds(calendar:universal_time()) - AgeSeconds),
-    mnesia:dirty_select(events,
-        [{#event{evid='$1', last_rx='$2', _='_'}, [{'=<', '$2', {const, ETime}}], ['$1']}]).
-
-purge_txframes(DevAddr) ->
-    lists:foreach(
-        fun(Obj) ->
-            ok = mnesia:dirty_delete_object(txframes, Obj)
-        end,
-        mnesia:dirty_match_object(txframes, #txframe{devaddr=DevAddr, _='_'})).
-
 % end of file

src/lorawan_db_guard.erl

@@ -0,0 +1,67 @@
+%
+% Copyright (c) 2016-2017 Petr Gotthard <petr.gotthard@centrum.cz>
+% All rights reserved.
+% Distributed under the terms of the MIT License. See the LICENSE file.
+%
+-module(lorawan_db_guard).
+-behaviour(gen_server).
+
+-export([purge_txframes/1]).
+
+-export([start_link/0]).
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
+
+-include_lib("lorawan_server_api/include/lorawan_application.hrl").
+-include("lorawan.hrl").
+
+start_link() ->
+    gen_server:start_link(?MODULE, [], []).
+
+init([]) ->
+    {ok, _} = timer:send_interval(3600*1000, trim_tables),
+    {ok, undefined}.
+
+handle_call(_Request, _From, State) ->
+    {reply, ignored, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+handle_info(trim_tables, State) ->
+    [trim_rxframes(R) || R <- mnesia:dirty_all_keys(links)],
+    [mnesia:dirty_delete(events, E) || E <- expired_events()],
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+
+trim_rxframes(DevAddr) ->
+    {ok, Count} = application:get_env(lorawan_server, retained_rxframes),
+    case lorawan_db:get_last_rxframes(DevAddr, Count) of
+        {[], _} ->
+            ok;
+        {ExpRec, _} ->
+            lager:debug("Expired ~w rxframes from ~w", [length(ExpRec), DevAddr]),
+            lists:foreach(fun(R) -> mnesia:dirty_delete_object(rxframes, R) end,
+                ExpRec)
+    end.
+
+purge_txframes(DevAddr) ->
+    lists:foreach(
+        fun(Obj) ->
+            ok = mnesia:dirty_delete_object(txframes, Obj)
+        end,
+        mnesia:dirty_match_object(txframes, #txframe{devaddr=DevAddr, _='_'})).
+
+expired_events() ->
+    {ok, AgeSeconds} = application:get_env(lorawan_server, event_lifetime),
+    ETime = calendar:gregorian_seconds_to_datetime(
+        calendar:datetime_to_gregorian_seconds(calendar:universal_time()) - AgeSeconds),
+    mnesia:dirty_select(events,
+        [{#event{evid='$1', last_rx='$2', _='_'}, [{'=<', '$2', {const, ETime}}], ['$1']}]).
+
+% end of file

src/lorawan_mac.erl

@@ -334,7 +334,7 @@ fcnt32_inc(FCntUp, N) ->
 reset_link(DevAddr) ->
     ok = mnesia:dirty_delete(pending, DevAddr),
     % delete previously stored TX frames
-    lorawan_db:purge_txframes(DevAddr).
+    lorawan_db_guard:purge_txframes(DevAddr).
 
 build_rxframe(Gateway, Link, RxQ, Confirm, Frame) ->
     TXPower = case Link#link.adr_use of

src/lorawan_sup.erl

@@ -16,6 +16,9 @@ start_link() ->
 init([]) ->
     lorawan_utils:throw_info(server, started),
     {ok, {{one_for_one, 10, 10}, [
+        {db_guard,
+            {lorawan_db_guard, start_link, []},
+            permanent, 5000, worker, [lorawan_db_guard]},
         {gateways,
             {lorawan_gw_sup, start_link, []},
             permanent, infinity, supervisor, [lorawan_gw_sup]},