diff --git a/src/cre.erl b/src/cre.erl index a7ef9e4..8c5de1d 100644 --- a/src/cre.erl +++ b/src/cre.erl @@ -94,7 +94,7 @@ start( _Type, _Args ) -> cowboy_router:compile( [{'_', [ {"/[status.json]", cre_status_handler, []}, - {"/cache.json", cre_cache_handler, []} + {"/history.json", cre_history_handler, []} ]}] ), {ok, _} = cowboy:start_clear( status_listener, diff --git a/src/cre_cache_handler.erl b/src/cre_history_handler.erl similarity index 94% rename from src/cre_cache_handler.erl rename to src/cre_history_handler.erl index 6430f36..66a13b1 100644 --- a/src/cre_cache_handler.erl +++ b/src/cre_history_handler.erl @@ -27,7 +27,7 @@ %% %% @end %% ------------------------------------------------------------------- --module( cre_cache_handler ). +-module( cre_history_handler ). -behavior( cowboy_handler ). %%==================================================================== @@ -38,7 +38,7 @@ init( Req0, State ) -> - CacheMap = cre_master:get_cache( cre_master ), + CacheMap = cre_master:get_history( cre_master ), Doc = jsone:encode( CacheMap ), Reply = diff --git a/src/cre_master.erl b/src/cre_master.erl index a85b808..94a9a18 100644 --- a/src/cre_master.erl +++ b/src/cre_master.erl @@ -37,7 +37,7 @@ %% API functions -export( [start_link/0, start_link/1, add_worker/2, worker_result/4, - cre_request/4, stop/1, get_status/1, get_cache/1] ). + cre_request/4, stop/1, get_status/1, get_history/1] ). %% gen_server callback functions -export( [code_change/3, handle_call/3, handle_cast/2, handle_info/2, init/1, @@ -142,12 +142,12 @@ get_status( CreName ) -> Info. --spec get_cache( CreName :: _ ) -> - #{ cache => [#{ app => _, delta => _ }] }. +-spec get_history( CreName :: _ ) -> + #{ history => [#{ app => _, delta => _ }] }. -get_cache( CreName ) -> - {ok, CacheMap} = gen_server:call( CreName, get_cache ), - CacheMap. +get_history( CreName ) -> + {ok, HistoryMap} = gen_server:call( CreName, get_history ), + HistoryMap. %%==================================================================== @@ -439,11 +439,11 @@ handle_call( get_status, _From, CreState ) -> -handle_call( get_cache, _From, CreState ) -> +handle_call( get_history, _From, CreState ) -> #cre_state{ cache = Cache } = CreState, - CacheMap = #{ cache => [#{ app => A, delta => R } || {A, R} <- maps:to_list( Cache )] }, - {reply, {ok, CacheMap}, CreState}; + HistoryMap = #{ history => [#{ app => A, delta => R } || {A, R} <- maps:to_list( Cache )] }, + {reply, {ok, HistoryMap}, CreState}; handle_call( _Request, _From, CreState ) -> {reply, {error, bad_msg}, CreState}.