Skip to content

Commit d8fc642

Browse files
committed
Split logging header and log retrieval to seperate repository
1 parent 26d7752 commit d8fc642

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

include/drink_mnesia.hrl

-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,3 @@
2525

2626
-record (machine, {machine, password, name, public_ip, available_sensor = false, machine_ip, allow_connect = true, admin_only = false}).
2727
-record (slot, {machine, num, name, price = 10000, avail = 0, disabled = false}).
28-
29-
-record (temperature, {machine, time, temperature}).
30-
-record (money_log, {time, username, admin = nil, amount, direction = out, reason}).
31-
-record (drop_log, {machine, slot, username, time, status = ok}).

rebar.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22

33
{deps, [{epam, "1", {git, "https://github.com/danw/epam.git", "HEAD"}},
44
{dw_gen_listener, "1.0", {git, "https://github.com/danw/dw_gen_listener.git", "HEAD"}},
5-
{dw_events, "1.0", {git, "https://github.com/danw/dw_events.git", "HEAD"}}]}.
5+
{dw_events, "1.0", {git, "https://github.com/danw/dw_events.git", "HEAD"}},
6+
{drink_log, "1.0", {git, "https://github.com/danw/drink_log.git", "HEAD"}}]}.

src/drink_json_api.erl

+4-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
-include ("user.hrl").
3232
-include ("drink_mnesia.hrl").
33+
-include_lib ("drink_log/include/drink_log.hrl").
3334

3435
args(_A, []) ->
3536
[];
@@ -66,13 +67,13 @@ request(U, drop, A) ->
6667
request(U, logs, A) ->
6768
case args(A, [offset, limit]) of
6869
[Offset, Limit] when Offset >= 0, Limit =< 100 ->
69-
case drink_mnesia:get_logs(U, Offset, Limit) of
70+
case drink_log:get_logs(U, Offset, Limit) of
7071
{ok, Data} ->
7172
ok(format_logs(Offset, Limit, Data));
7273
{error, Reason} ->
7374
error(Reason)
7475
end;
75-
{error, {arg_mising, _}} ->
76+
{error, {arg_missing, _}} ->
7677
error(arg_missing);
7778
_ ->
7879
error(invalid_args)
@@ -127,7 +128,7 @@ request(_U, temperatures, A) ->
127128
[From, Limit] when From >= 0, Limit >= 0, Limit =< 100000 ->
128129
FromSecs = From + calendar:datetime_to_gregorian_seconds({{1970, 1, 1}, {0, 0, 0}}),
129130
FromDate = calendar:gregorian_seconds_to_datetime(FromSecs),
130-
case drink_mnesia:get_temps(FromDate, Limit) of
131+
case drink_log:get_temps(FromDate, Limit) of
131132
{ok, Data} ->
132133
ok(format_temps(From, Limit, Data));
133134
{error, Reason} ->

src/drink_machine.erl

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
-export ([password/1, public_ip/1, available_sensor/1, machine_ip/1, allow_connect/1, admin_only/1]).
3535

3636
-include ("drink_mnesia.hrl").
37+
-include_lib ("drink_log/include/drink_log.hrl").
3738
-include_lib ("stdlib/include/qlc.hrl").
3839

3940
-record (dmstate, {

src/user_auth.erl

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
-include ("user.hrl").
3737
-include ("drink_mnesia.hrl").
38+
-include_lib ("drink_log/include/drink_log.hrl").
3839

3940
-record (uastate, {reftable,usertable,userinfo_mod}).
4041

0 commit comments

Comments
 (0)