ben.carrasco/jambonz-feature-server
1
0
Fork 0
mirror of https://github.com/jambonz/jambonz-feature-server.git synced 2025-12-21 17:17:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove leftover merge brackets

Browse Source
This commit is contained in:
Dave Horton
2021-07-31 13:23:36 -04:00
parent 59cf0610dd
commit 0ea50e7bdd
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/tasks/dial.js
View File

@@ -145,15 +145,9 @@ class TaskDial extends Task {
if (this.epOther) this._installDtmfDetection(cs, this.epOther, this.parentDtmfCollector); if (this.epOther) this._installDtmfDetection(cs, this.epOther, this.parentDtmfCollector);
await this._attemptCalls(cs); await this._attemptCalls(cs);
await this.awaitTaskDone(); await this.awaitTaskDone();
<<<<<<< HEAD
await this.performAction(this.results);
if (this.epOther) this._removeDtmfDetection(cs, this.epOther);
=======
this.logger.debug({callSid: this.cs.callSid}, 'Dial:exec task is done, sending actionHook if any'); this.logger.debug({callSid: this.cs.callSid}, 'Dial:exec task is done, sending actionHook if any');
await this.performAction(this.results, this.killReason !== KillReason.Replaced); await this.performAction(this.results, this.killReason !== KillReason.Replaced);
this._removeDtmfDetection(cs, this.epOther); this._removeDtmfDetection(cs, this.epOther);
>>>>>>> 2b782bc... bugfix for enqueue and dial when these tasks are replaced by LCC
this._removeDtmfDetection(cs, this.ep); this._removeDtmfDetection(cs, this.ep);
} catch (err) { } catch (err) {
this.logger.error({err}, 'TaskDial:exec terminating with error'); this.logger.error({err}, 'TaskDial:exec terminating with error');
@@ -163,12 +157,8 @@ class TaskDial extends Task {
async kill(cs, reason) { async kill(cs, reason) {
super.kill(cs); super.kill(cs);
<<<<<<< HEAD
if (this.epOther) this._removeDtmfDetection(this.cs, this.epOther);
=======
this.killReason = reason || KillReason.Hangup; this.killReason = reason || KillReason.Hangup;
this._removeDtmfDetection(this.cs, this.epOther); this._removeDtmfDetection(this.cs, this.epOther);
>>>>>>> 2b782bc... bugfix for enqueue and dial when these tasks are replaced by LCC
this._removeDtmfDetection(this.cs, this.ep); this._removeDtmfDetection(this.cs, this.ep);
this._killOutdials(); this._killOutdials();
if (this.sd) { if (this.sd) {