Skip to content

Commit

Permalink
Merge branch 'acdc_updates' into master-acdc
Browse files Browse the repository at this point in the history
  • Loading branch information
kageds authored May 29, 2020
2 parents fb7f1cc + 131f184 commit d98a322
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
11 changes: 0 additions & 11 deletions applications/acdc/src/acdc_agent_fsm.erl
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,6 @@ ready({'member_connect_win', JObj, 'different_node'}, #state{agent_listener=Agen
'undefined' -> 'ringing';
_Details -> 'ringing_callback'
end,

lager:debug("monitoring agent ~s to connect to caller in queue ~s", [AgentId, QueueId]),
{'next_state', NextState, State#state{wrapup_timeout=WrapupTimer
,member_call=Call
Expand Down Expand Up @@ -1132,9 +1131,7 @@ ringing_callback({'originate_failed', JObj}, #state{agent_listener=AgentListener
]),

acdc_agent_listener:member_connect_retry(AgentListener, CallId),

_ = acdc_stats:call_missed(AccountId, QueueId, AgentId, CallId, ErrReason),

acdc_agent_listener:presence_update(AgentListener, ?PRESENCE_GREEN),

{'next_state', 'ringing_callback', State};
Expand Down Expand Up @@ -1303,13 +1300,9 @@ awaiting_callback({'originate_failed', JObj}, #state{account_id=AccountId
,{<<"Agent-ID">>, AgentId}
| kz_api:default_headers(?APP_NAME, ?APP_VERSION)
]),

acdc_agent_listener:member_connect_accepted(AgentListener, ACallId, MemberCall),

_ = acdc_stats:call_handled(AccountId, QueueId, OriginalMemberCallId, AgentId),

acdc_agent_listener:presence_update(AgentListener, ?PRESENCE_GREEN),

{'next_state', 'awaiting_callback', State#state{wrapup_ref=hangup_call(State, 'member')}};
awaiting_callback({'shared_failure', _}, #state{agent_listener=AgentListener
,agent_call_id=ACallId
Expand Down Expand Up @@ -1387,7 +1380,6 @@ awaiting_callback(?DESTROYED_CHANNEL(ACallId, _Cause), #state{agent_listener=Age
}=State) ->
lager:debug("agent hungup ~s while waiting for a callback to connect", [ACallId]),
acdc_agent_listener:channel_hungup(AgentListener, ACallId),

{'next_state', 'wrapup', State#state{wrapup_ref=hangup_call(State, 'member')}};
awaiting_callback(?DESTROYED_CHANNEL(ACallId, _Cause), #state{account_id=AccountId
,agent_id=AgentId
Expand All @@ -1400,11 +1392,8 @@ awaiting_callback(?DESTROYED_CHANNEL(ACallId, _Cause), #state{account_id=Account
lager:info("agent hungup ~s while waiting for a callback to connect", [ACallId]),

acdc_agent_listener:member_connect_accepted(AgentListener, ACallId, MemberCall),

_ = acdc_stats:call_handled(AccountId, QueueId, OriginalMemberCallId, AgentId),

acdc_agent_listener:presence_update(AgentListener, ?PRESENCE_GREEN),

{'next_state', 'wrapup', State#state{wrapup_ref=hangup_call(State, 'member')}};
awaiting_callback(?DESTROYED_CHANNEL(CallId, Cause), State) ->
maybe_member_no_answer(CallId, Cause, State);
Expand Down
1 change: 0 additions & 1 deletion applications/acdc/src/acdc_queue_fsm.erl
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,6 @@ connecting({'accepted', AcceptJObj}, #state{queue_proc=Srv
%% If the old call id is set, we've already done the call handled stat update
_ -> 'ok'
end,

{'next_state', 'ready', clear_member_call(State), 'hibernate'};
'false' ->
lager:debug("ignoring accepted message"),
Expand Down

0 comments on commit d98a322

Please sign in to comment.