bin/load reads LOGPLEX_AUTH_KEY correctly

heroku · Jan 24, 2012 · 34e2ece · 34e2ece
1 parent b8bcd23
commit 34e2ece
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/bin/load b/bin/load
@@ -8,9 +8,10 @@ main([]) ->
 main(Modules) ->
     application:start(inets),
     JSON = iolist_to_binary(mochijson2:encode([list_to_binary(Module) || Module <- Modules])),
-    {match, [Auth]} = re:run(Body, "export LOGPLEX_AUTH_KEY='(\\S+)'", [{capture, all_but_first, binary}]),
+    {ok, File} = file:read_file("keys.sh"),
+    {match, [Auth]} = re:run(File, "export LOGPLEX_AUTH_KEY='(\\S+)'", [{capture, all_but_first, binary}]),
     Headers = [
-        {'Authorization', Auth}
+        {"Authorization", Auth}
     ],
     case httpc:request(post, {"http://localhost:8001/load", Headers, "application/json", JSON}, [], []) of
         {ok, {{_, 200, _}, _, Body}} ->

diff --git a/src/logplex_api.erl b/src/logplex_api.erl
@@ -90,7 +90,7 @@ handlers() ->
     {['POST', "/load$"], fun(Req, _Match) ->
         authorize(Req),
         Body = Req:recv_body(),
-        {struct, Modules} = mochijson2:decode(Body),
+        Modules = mochijson2:decode(Body),
         not is_list(Modules) andalso exit({expected_list}),
 
         {RespCode, Json} = lists:foldl(fun(Module, {Code, Acc}) ->