summaryrefslogtreecommitdiff
path: root/src/storage.erl
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2015-11-13 16:01:09 +0100
committerLinus Nordberg <linus@nordu.net>2015-11-13 16:01:09 +0100
commitac53699656776f3fe8757e4fe96d1101c5c56681 (patch)
tree4bf061f8a8be3c9a9cc131c1db3a29dfae0564fc /src/storage.erl
parent6eda14bd23c8bdf5ea2064ee9a9c8e92718c5176 (diff)
Follow catlfish change in how request() is being called.parametrise_url
Diffstat (limited to 'src/storage.erl')
-rw-r--r--src/storage.erl12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/storage.erl b/src/storage.erl
index 6c38adf..a1f62f9 100644
--- a/src/storage.erl
+++ b/src/storage.erl
@@ -5,9 +5,11 @@
-module(storage).
%% API (URL)
--export([request/3]).
+-export([request/4]).
-request(post, "plop/v1/storage/sendentry", Input) ->
+-define(APPURL_PLOP_STORAGE, "plop/v1/storage").
+
+request(post, ?APPURL_PLOP_STORAGE, "sendentry", Input) ->
case (catch mochijson2:decode(Input)) of
{error, E} ->
html("sendentry: bad input:", E);
@@ -19,7 +21,7 @@ request(post, "plop/v1/storage/sendentry", Input) ->
ok = storagedb:add(TreeLeafHash),
success({[{result, <<"ok">>}]})
end;
-request(post, "plop/v1/storage/entrycommitted", Input) ->
+request(post, ?APPURL_PLOP_STORAGE, "entrycommitted", Input) ->
case (catch mochijson2:decode(Input)) of
{error, E} ->
html("entrycommitted: bad input:", E);
@@ -29,7 +31,7 @@ request(post, "plop/v1/storage/entrycommitted", Input) ->
db:add_entryhash(LeafHash, EntryHash),
success({[{result, <<"ok">>}]})
end;
-request(get, "plop/v1/storage/fetchnewentries", _Input) ->
+request(get, ?APPURL_PLOP_STORAGE, "fetchnewentries", _Input) ->
{LastIndexOrZero, LastHash} = storagedb:lastverifiednewentry(),
LastVerifiedAndNewHashes = storagedb:fetchnewhashes(LastIndexOrZero),
NewHashes = case {LastHash, LastVerifiedAndNewHashes} of
@@ -45,7 +47,7 @@ request(get, "plop/v1/storage/fetchnewentries", _Input) ->
end, NewHashes),
success({[{result, <<"ok">>},
{entries, Entries}]});
-request(get, "plop/v1/storage/getentry", Query) ->
+request(get, ?APPURL_PLOP_STORAGE, "getentry", Query) ->
Hashes = [base64:decode(Value) || {Key, Value} <- Query, Key == "hash"],
Entries = lists:map(fun(LeafHash) ->
{[{hash, base64:encode(LeafHash)},