Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: chef/chef-server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c19cb94fd04e0dd1337649a4b83daee33a542bf6
Choose a base ref
..
head repository: chef/chef-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c029b86394f14b79fa4f6f7b62ffd8efba364eb3
Choose a head ref
Showing with 5 additions and 2 deletions.
  1. +5 −2 src/oc_erchef/apps/oc_chef_wm/src/chef_wm_search.erl
7 changes: 5 additions & 2 deletions src/oc_erchef/apps/oc_chef_wm/src/chef_wm_search.erl
View file
Original file line number Diff line number Diff line change
@@ -367,8 +367,11 @@ extract_path(Item, Path) ->
%% This typically happens when the user provides an invalid attribute
%% key, typically trying to access a value as a hash that is actually
%% a string (i.e. uptime.seconds)
error:function_clause -> null;
Error:Reason -> {Error, Reason}
error:function_clause ->
<<"ERROR - Attribute does not exist">>;
_Error:Reason ->
error_logger:warning_msg("There was an issue extracting attribute ~p from ~p: ~p", [Path, Item, Reason]),
<<"ERROR - Invalid Attribute or Object">>
end.

make_search_results(BulkGetFun, Ids, BatchSize, Start, NumFound) ->