fix branched callflow not being properly killed, prevent cf_pivot fro…

…m waiting forever (2600hz#5222)
kagesys · Oct 16, 2018 · d5932c3 · d5932c3
1 parent cc35d4e
commit d5932c3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/applications/callflow/src/cf_exe.erl b/applications/callflow/src/cf_exe.erl
@@ -540,6 +540,12 @@ handle_info({'DOWN', Ref, 'process', Pid, 'normal'}, #state{cf_module_pid={Pid,
     erlang:demonitor(Ref, ['flush']),
     lager:debug("cf module ~s down normally", [kapps_call:kvs_fetch('cf_last_action', Call)]),
     {'noreply', State#state{cf_module_pid='undefined'}};
+handle_info({'DOWN', Ref, 'process', Pid, 'killed'}, #state{cf_module_pid={Pid, Ref}
+                                                           ,call=Call
+                                                           }=State) ->
+    erlang:demonitor(Ref, ['flush']),
+    lager:debug("cf module ~s down normally", [kapps_call:kvs_fetch('cf_last_action', Call)]),
+    {'noreply', State#state{cf_module_pid='undefined'}};
 handle_info({'DOWN', Ref, 'process', Pid, _Reason}, #state{cf_module_pid={Pid, Ref}
                                                           ,call=Call
                                                           }=State) ->
@@ -556,6 +562,12 @@ handle_info({'EXIT', Pid, 'normal'}, #state{cf_module_pid={Pid, Ref}
     erlang:demonitor(Ref, ['flush']),
     lager:debug("cf module ~s down normally", [kapps_call:kvs_fetch('cf_last_action', Call)]),
     {'noreply', State#state{cf_module_pid='undefined'}};
+handle_info({'EXIT', Pid, 'killed'}, #state{cf_module_pid={Pid, Ref}
+                                           ,call=Call
+                                           }=State) ->
+    erlang:demonitor(Ref, ['flush']),
+    lager:debug("cf module ~s killed normally", [kapps_call:kvs_fetch('cf_last_action', Call)]),
+    {'noreply', State#state{cf_module_pid='undefined'}};
 handle_info({'EXIT', Pid, _Reason}, #state{cf_module_pid={Pid, Ref}
                                           ,call=Call
                                           }=State) ->
@@ -570,6 +582,12 @@ handle_info({'EXIT', Pid, 'normal'}, #state{cf_module_old_pid={Pid, Ref}
     erlang:demonitor(Ref, ['flush']),
     lager:debug("cf module ~s down normally", [kapps_call:kvs_fetch('cf_old_action', Call)]),
     {'noreply', State#state{cf_module_old_pid='undefined'}};
+handle_info({'EXIT', Pid, 'killed'}, #state{cf_module_old_pid={Pid, Ref}
+                                           ,call=Call
+                                           }=State) ->
+    erlang:demonitor(Ref, ['flush']),
+    lager:debug("cf module ~s killed normally", [kapps_call:kvs_fetch('cf_old_action', Call)]),
+    {'noreply', State#state{cf_module_old_pid='undefined'}};
 handle_info({'EXIT', Pid, _Reason}, #state{cf_module_old_pid={Pid, Ref}
                                           ,call=Call
                                           }=State) ->
@@ -906,7 +924,7 @@ handle_channel_pivoted(Self, PidRef, JObj, Call) ->
 
 -spec maybe_stop_action(kz_term:api_pid_ref()) -> 'ok'.
 maybe_stop_action({Pid, _Ref}) ->
-    exit(Pid, 'normal');
+    exit(Pid, 'kill');
 maybe_stop_action('undefined') -> 'ok'.
 
 -spec stop_bad_destination(kapps_call:call()) -> 'ok'.

diff --git a/applications/callflow/src/module/cf_pivot.erl b/applications/callflow/src/module/cf_pivot.erl
@@ -77,9 +77,10 @@ wait_for_pivot(Data, Call) ->
                 {<<"pivot">>,<<"failed">>} ->
                     lager:warning("pivot failed failing back to next callflow action"),
                     cf_exe:continue(Call);
-                _ ->
+                _Other ->
                     wait_for_pivot(Data, Call)
             end;
         {'error', 'timeout'} ->
-            wait_for_pivot(Data, Call)
+            lager:error("timeout waiting for pivot response, continuing"),
+            cf_exe:continue(Call)
     end.