Standardize error handling and name of "function" tuple across key an…

…d value gen

src/basho_bench_keygen.erl

@@ -54,8 +54,13 @@ new({pareto_int, MaxKey}, _Id) ->
 new({pareto_int_bin, MaxKey}, _Id) ->
     Pareto = pareto(trunc(MaxKey * 0.2), ?PARETO_SHAPE),
     fun() -> <<(Pareto()):32/native>> end;
-new({external, M, F, A}, Id) ->
-    apply(M, F, [Id] ++ A);
+new({function, Module, Function, Args}, Id) ->
+    case code:ensure_loaded(Module) of
+        {module, Module} ->
+            erlang:apply(Module, Function, [Id] ++ Args);
+        _Error ->
+            ?FAIL_MSG("Could not find keygen function: ~p:~p\n", [Module, Function])
+    end;
 new(Other, _Id) ->
     ?FAIL_MSG("Unsupported key generator requested: ~p\n", [Other]).
 

src/basho_bench_valgen.erl

@@ -40,13 +40,12 @@ new({uniform_bin, MinSize, MaxSize}, _Id) ->
     Source = init_source(),
     Diff = MaxSize - MinSize,
     fun() -> data_block(Source, MinSize + random:uniform(Diff)) end;
-new({function, Module, Function, Args}, _Id) ->
+new({function, Module, Function, Args}, Id) ->
     case code:ensure_loaded(Module) of
-        {module, Module} -> 
-            erlang:apply(Module, Function, Args);
-        _Error -> 
-            error_logger:error_msg("Could not find module: ~p~n", [Module]),
-            throw({error, module_not_found, Module})
+        {module, Module} ->
+            erlang:apply(Module, Function, [Id] ++ Args);
+        _Error ->
+            ?FAIL_MSG("Could not find valgen function: ~p:~p\n", [Module, Function])
     end;
 new(Other, _Id) ->
     ?FAIL_MSG("Unsupported value generator requested: ~p\n", [Other]).