Merge pull request #59 from inaka/euen.57.58.fix_issues

[Close #57][Close #58] :)
inaka · May 31, 2017 · f7de88a · f7de88a
2 parents 8492589 + be6fb84
commit f7de88a
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 11 deletions.
diff --git a/rebar.config b/rebar.config
@@ -61,13 +61,15 @@
 
 %% == Dependencies ==
 
-{deps, [ {jiffy,       "0.14.7"}
+{deps, [ {jsx,         "2.8.2"}
        , {shotgun,     "0.3.0"}
-       , {worker_pool, "1.0.4"}]}.
+       , {eper,        "0.94.0"}
+       , {worker_pool, "2.2.3"}]}.
 
 %% == Dialyzer ==
 
-{dialyzer, [ {warnings, [ underspecs
+{dialyzer, [ {warnings, [ race_conditions
+                        , unknown
                         , no_return
                         , unmatched_returns
                         , error_handling

diff --git a/rebar.lock b/rebar.lock
@@ -1,6 +1,18 @@
-[{<<"cowlib">>,{pkg,<<"cowlib">>,<<"1.0.2">>},2},
+{"1.1.0",
+[{<<"cowlib">>,{pkg,<<"cowlib">>,<<"1.3.0">>},2},
+ {<<"eper">>,{pkg,<<"eper">>,<<"0.94.0">>},0},
  {<<"gun">>,{pkg,<<"gun">>,<<"1.0.0-pre.1">>},1},
- {<<"jiffy">>,{pkg,<<"jiffy">>,<<"0.14.7">>},0},
+ {<<"jsx">>,{pkg,<<"jsx">>,<<"2.8.2">>},0},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"1.1.0">>},2},
  {<<"shotgun">>,{pkg,<<"shotgun">>,<<"0.3.0">>},0},
- {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"1.0.4">>},0}].
+ {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"2.2.3">>},0}]}.
+[
+{pkg_hash,[
+ {<<"cowlib">>, <<"6C80CA7F2863C0D7A21C946312BAF473432B56A79E46E20BC27A3BAC07C40439">>},
+ {<<"eper">>, <<"F5FB2DAA0DF8878748E1C598428EDA942A173E5121FF35C1D632129B84593A3A">>},
+ {<<"gun">>, <<"28514327A7572234633E127C1C14C5D91991BC26EC16D3707F05962A31F0C1B5">>},
+ {<<"jsx">>, <<"7ACC7D785B5ABE8A6E9ADBDE926A24E481F29956DD8B4DF49E3E4E7BCC92A018">>},
+ {<<"ranch">>, <<"F7ED6D97DB8C2A27CCA85CACBD543558001FC5A355E93A7BFF1E9A9065A8545B">>},
+ {<<"shotgun">>, <<"54EA3C243B65A935A3491A079A573C9D119A5EAF28BC2673893F8EEF66FDC053">>},
+ {<<"worker_pool">>, <<"2CD7B2C289B900940297D283922D7E119C540CB8F29B5254639ABB9BFB100CAE">>}]}
+].
diff --git a/src/tirerl.app.src b/src/tirerl.app.src
@@ -6,7 +6,7 @@
   {applications,
     [kernel,
      stdlib,
-     jiffy,
+     jsx,
      shotgun,
      worker_pool
     ]},

diff --git a/src/tirerl_sup.erl b/src/tirerl_sup.erl
@@ -30,7 +30,7 @@ start_pool(Name, Opts) ->
     WPoolOptions  = [{overrun_warning, infinity},
                      {overrun_handler, {error_logger, warning_report}},
                      {workers, 50},
-                     {worker, {tirerl_worker, [{Name, Opts}]}}
+                     {worker, {tirerl_worker, Opts}}
                     ],
 
     PoolSpec = {Name,

diff --git a/src/tirerl_worker.erl b/src/tirerl_worker.erl
@@ -124,7 +124,7 @@ do_request(Req, #{connection := Conn}) ->
 
     Body1 = case Body of
                 Body when is_binary(Body) -> Body;
-                _ -> jiffy:encode(Body)
+                _ -> jsx:encode(Body)
             end,
 
     FullUri =
@@ -146,7 +146,7 @@ process_response({error, _} = Response) ->
     Response;
 process_response({ok, #{status_code := Status, body := Body} = Response}) ->
     try
-        Json = jiffy:decode(Body, [return_maps]),
+        Json = jsx:decode(Body, [return_maps]),
         case Status of
             Status when Status < 400 ->
                 {ok, Json};

diff --git a/test/tirerl_meta_SUITE.erl b/test/tirerl_meta_SUITE.erl
@@ -9,9 +9,12 @@
           ]
         }]).
 
--export([init_per_suite/1]).
+-export([init_per_suite/1, end_per_suite/1]).
 
 -type config() :: [{atom(), term()}].
 
 -spec init_per_suite(config()) -> config().
 init_per_suite(Config) -> [{application, tirerl} | Config].
+
+-spec end_per_suite(config()) -> config().
+end_per_suite(Config) -> Config.