diff options
| -rw-r--r-- | Emakefile | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/statusreport.erl | 2 | ||||
| -rw-r--r-- | statsserver/ebin/statsserver.app | 13 | ||||
| -rw-r--r-- | statusserver/ebin/statusserver.app | 13 | ||||
| -rw-r--r-- | statusserver/src/statusserver.erl (renamed from statsserver/src/statsserver.erl) | 4 | ||||
| -rw-r--r-- | statusserver/src/statusserver_app.erl (renamed from statsserver/src/statsserver_app.erl) | 6 | ||||
| -rw-r--r-- | statusserver/src/statusserver_sup.erl (renamed from statsserver/src/statsserver_sup.erl) | 2 |
8 files changed, 23 insertions, 23 deletions
@@ -10,9 +10,9 @@ {i, "src/"}, % For plop.hrl. {outdir, "merge/ebin/"}, {parse_transform, lager_transform}]}. -{["statsserver/src/*"], +{["statusserver/src/*"], [debug_info, {i, "../"}, % For hackney. {i, "src/"}, % For plop.hrl. - {outdir, "statsserver/ebin/"}, + {outdir, "statusserver/ebin/"}, {parse_transform, lager_transform}]}. @@ -11,7 +11,7 @@ clean: -rm priv/fsynchelper -rm ebin/*.beam -rm merge/ebin/*.beam - -rm statsserver/ebin/*.beam + -rm statusserver/ebin/*.beam dialyze: build dialyzer ebin merge/ebin tags: diff --git a/src/statusreport.erl b/src/statusreport.erl index cd5bb5a..63414cd 100644 --- a/src/statusreport.erl +++ b/src/statusreport.erl @@ -112,7 +112,7 @@ encode_status({multi, Statuses}) -> send(Service, Statusreports, Nodename) -> lager:debug("reporting status to ~p: ~p", [Service, Statusreports]), - [NodeAddress] = plopconfig:get_env(statsservers, []), + [NodeAddress] = plopconfig:get_env(statusservers, []), DebugTag = "statusreport", URL = NodeAddress ++ Service, Headers = [{"Content-Type", "text/json"}], diff --git a/statsserver/ebin/statsserver.app b/statsserver/ebin/statsserver.app deleted file mode 100644 index 9c642ed..0000000 --- a/statsserver/ebin/statsserver.app +++ /dev/null @@ -1,13 +0,0 @@ -%%% Copyright (c) 2017, NORDUnet A/S. -%%% See LICENSE for licensing information. - -%%% Application resource file for statsserver, see app(5). - -{application, statsserver, - [{description, "Plop statsserver"}, - {vsn, "0.10.1"}, - {modules, [statsserver_app, statsserver_sup, statsserver]}, - {applications, [kernel, stdlib, lager, plop]}, - {registered, [statsserver_sup, statsserver]}, - {mod, {statsserver_app, []}} - ]}. diff --git a/statusserver/ebin/statusserver.app b/statusserver/ebin/statusserver.app new file mode 100644 index 0000000..1a032f1 --- /dev/null +++ b/statusserver/ebin/statusserver.app @@ -0,0 +1,13 @@ +%%% Copyright (c) 2017, NORDUnet A/S. +%%% See LICENSE for licensing information. + +%%% Application resource file for statusserver, see app(5). + +{application, statusserver, + [{description, "Plop statusserver"}, + {vsn, "0.10.1"}, + {modules, [statusserver_app, statusserver_sup, statusserver]}, + {applications, [kernel, stdlib, lager, plop]}, + {registered, [statusserver_sup, statusserver]}, + {mod, {statusserver_app, []}} + ]}. diff --git a/statsserver/src/statsserver.erl b/statusserver/src/statusserver.erl index 1d42b27..323b28d 100644 --- a/statsserver/src/statsserver.erl +++ b/statusserver/src/statusserver.erl @@ -3,7 +3,7 @@ %%% @doc Frontend node API --module(statsserver). +-module(statusserver). -export([init_module/0]). %% API (URL) -export([request/4]). @@ -46,7 +46,7 @@ html(Text, Input) -> "~p~n" ++ "</body></html>~n", [Text, Input])}. --define(STATUSDB_TABLE, statsserver_statusdb). +-define(STATUSDB_TABLE, statusserver_statusdb). init_module() -> create_statusdb(). diff --git a/statsserver/src/statsserver_app.erl b/statusserver/src/statusserver_app.erl index 6caf2b7..2fd8b8d 100644 --- a/statsserver/src/statsserver_app.erl +++ b/statusserver/src/statusserver_app.erl @@ -1,13 +1,13 @@ %%% Copyright (c) 2017, NORDUnet A/S. %%% See LICENSE for licensing information. --module(statsserver_app). +-module(statusserver_app). -behaviour(application). -export([start/2, stop/1]). start(normal, Args) -> - statsserver:init_module(), - statsserver_sup:start_link(Args). + statusserver:init_module(), + statusserver_sup:start_link(Args). stop(_State) -> ok. diff --git a/statsserver/src/statsserver_sup.erl b/statusserver/src/statusserver_sup.erl index 6b92e35..5b0811a 100644 --- a/statsserver/src/statsserver_sup.erl +++ b/statusserver/src/statusserver_sup.erl @@ -1,7 +1,7 @@ %%% Copyright (c) 2017, NORDUnet A/S. %%% See LICENSE for licensing information. --module(statsserver_sup). +-module(statusserver_sup). -behaviour(supervisor). -export([start_link/1, init/1]). |