Skip to content

Commit

Permalink
KZOO-41: handle number delete conflicts (2600hz#6290)
Browse files Browse the repository at this point in the history
This is a forward port of the 4.3 version that corrects an error where
retrying deletes caused a save operation instead. This bug is
corrected in current master; this commit serves to forward-port the
pqc test recreation of the 4.3 issue.
  • Loading branch information
jamesaimonetti authored Feb 5, 2020
1 parent 3bfdec2 commit 7f6f4fd
Show file tree
Hide file tree
Showing 4 changed files with 176 additions and 82 deletions.
2 changes: 1 addition & 1 deletion core/kazoo_data/src/kzs_doc.erl
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ prepare_publish(JObj) ->

-spec maybe_tombstone(kz_json:object()) -> kz_json:object().
maybe_tombstone(JObj) ->
maybe_tombstone(JObj, kz_json:is_true(<<"_deleted">>, JObj, 'false')).
maybe_tombstone(JObj, kz_doc:is_deleted(JObj)).

-spec maybe_tombstone(kz_json:object(), boolean()) -> kz_json:object().
maybe_tombstone(JObj, 'true') ->
Expand Down
2 changes: 1 addition & 1 deletion core/kazoo_numbers/src/knm_locality.erl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
fetch(Numbers) when is_list(Numbers)->
case knm_config:locality_url() of
'undefined' ->
lager:error("could not get number locality url"),
?LOG_WARNING("could not get number locality url"),
{'error', 'missing_url'};
Url ->
Resp = fetch_req(Numbers, Url),
Expand Down
Loading

0 comments on commit 7f6f4fd

Please sign in to comment.