Skip to content

Commit 8ae5985

Browse files
gvagenasgvagenas
committed
Merge branch 'master' of github.com:RestComm/Restcomm-Connect
2 parents b9c31a6 + 9c29739 commit 8ae5985

4 files changed

Lines changed: 32 additions & 29 deletions

File tree

‎restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/Connection.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public final class Connection extends UntypedActor {
8585
private ActorRef endpoint;
8686
private EndpointIdentifier endpointId;
8787
private ConnectionIdentifier connId;
88+
private ConnectionIdentifier requestedConnId;
8889
private ConnectionDescriptor localDesc;
8990
private ConnectionDescriptor remoteDesc;
9091
private boolean webrtc;
@@ -198,6 +199,11 @@ public void onReceive(final Object message) throws Exception {
198199
fsm.transition(message, open);
199200
}
200201
} else {
202+
String err = String.format(
203+
"MGCP Transaction did not executed normally: session: %s | endpointId: %s | requestedConnId: %s | connId: %s",
204+
session.id() + "", endpointId == null ? "null" : endpointId.getLocalEndpointName(),
205+
requestedConnId, connId);
206+
logger.error(err);
201207
if (modifying.equals(state)) {
202208
fsm.transition(message, closing);
203209
} else {
@@ -270,7 +276,11 @@ public void execute(final Object message) throws Exception {
270276
log(ConnectionStateChanged.State.CLOSED);
271277
// If we timed out log it.
272278
if (message instanceof ReceiveTimeout) {
273-
logger.error("The media gateway failed to respond in the requested timout period.");
279+
String err = String.format(
280+
"The media gateway failed to respond in the requested timout period. session: %s | endpointId: %s | requestedConnId: %s | connId: %s",
281+
session.id() + "", endpointId == null ? "null" : endpointId.getLocalEndpointName(),
282+
requestedConnId, connId);
283+
logger.error(err);
274284
}
275285
}
276286
}
@@ -435,7 +445,7 @@ public void execute(final Object message) throws Exception {
435445
final UpdateConnection request = (UpdateConnection) message;
436446
final String sessionId = Integer.toString(session.id());
437447
final CallIdentifier callId = new CallIdentifier(sessionId);
438-
ConnectionIdentifier requestedConnId = request.connectionIdentifier();
448+
requestedConnId = request.connectionIdentifier();
439449
requestedConnId = requestedConnId==null ? connId:requestedConnId;
440450
final ModifyConnection mdcx = new ModifyConnection(source, callId, endpointId, requestedConnId);
441451
final ConnectionMode mode = request.mode();

‎restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/MediaGateway.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,8 @@ public void onReceive(final Object message) throws Exception {
298298
if (logger.isDebugEnabled()){
299299
logger.debug("MediaGateway onReceive. self.isTerminated: "+self.isTerminated()+" | Processing "+klass.getName()+" | object snapshot: \n"+this.toString());
300300
}
301+
if(self.isTerminated())
302+
logger.error("MediaGateway is Terminated.");
301303
if (PowerOnMediaGateway.class.equals(klass)) {
302304
powerOn(message);
303305
} else if (PowerOffMediaGateway.class.equals(klass)) {

‎restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/MediaResourceBrokerGeneric.java‎

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@
2020
*/
2121
package org.restcomm.connect.mrb;
2222

23-
import akka.actor.ActorRef;
24-
import akka.actor.Props;
25-
import akka.actor.UntypedActor;
26-
import akka.actor.UntypedActorFactory;
27-
import akka.event.Logging;
28-
import akka.event.LoggingAdapter;
29-
import jain.protocol.ip.mgcp.CreateProviderException;
30-
import jain.protocol.ip.mgcp.JainMgcpProvider;
31-
import jain.protocol.ip.mgcp.JainMgcpStack;
23+
import java.net.InetAddress;
24+
import java.net.URI;
25+
import java.net.UnknownHostException;
26+
import java.util.HashMap;
27+
import java.util.List;
28+
import java.util.Map;
29+
3230
import org.apache.commons.configuration.Configuration;
3331
import org.joda.time.DateTime;
3432
import org.mobicents.protocols.mgcp.stack.JainMgcpStackImpl;
@@ -43,21 +41,22 @@
4341
import org.restcomm.connect.dao.entities.ConferenceDetailRecordFilter;
4442
import org.restcomm.connect.dao.entities.MediaServerEntity;
4543
import org.restcomm.connect.mgcp.MediaResourceBrokerResponse;
46-
import org.restcomm.connect.mgcp.PowerOffMediaGateway;
4744
import org.restcomm.connect.mgcp.PowerOnMediaGateway;
4845
import org.restcomm.connect.mrb.api.GetConferenceMediaResourceController;
4946
import org.restcomm.connect.mrb.api.GetMediaGateway;
5047
import org.restcomm.connect.mrb.api.MediaGatewayForConference;
5148
import org.restcomm.connect.mrb.api.StartMediaResourceBroker;
5249
import org.restcomm.connect.telephony.api.ConferenceStateChanged;
5350

54-
import java.net.InetAddress;
55-
import java.net.URI;
56-
import java.net.UnknownHostException;
57-
import java.util.HashMap;
58-
import java.util.Iterator;
59-
import java.util.List;
60-
import java.util.Map;
51+
import akka.actor.ActorRef;
52+
import akka.actor.Props;
53+
import akka.actor.UntypedActor;
54+
import akka.actor.UntypedActorFactory;
55+
import akka.event.Logging;
56+
import akka.event.LoggingAdapter;
57+
import jain.protocol.ip.mgcp.CreateProviderException;
58+
import jain.protocol.ip.mgcp.JainMgcpProvider;
59+
import jain.protocol.ip.mgcp.JainMgcpStack;
6160

6261
/**
6362
* @author maria.farooq@telestax.com (Maria Farooq)
@@ -378,15 +377,7 @@ public void postStop() {
378377

379378
protected void cleanup() {
380379
try {
381-
if(mediaGatewayMap != null){
382-
Iterator<String> gatewayKeys = mediaGatewayMap.keySet().iterator();
383-
while (gatewayKeys.hasNext()){
384-
ActorRef mg = mediaGatewayMap.get(gatewayKeys.next());
385-
mg.tell(new PowerOffMediaGateway(), self());
386-
}
387-
}
388380
if (mgcpStack != null){
389-
mgcpStack.deleteProvider(mgcpProvider);
390381
mgcpStack = null;
391382
}
392383
mediaGatewayMap = null;

‎restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,10 +1172,10 @@ private boolean redirectToHostedVoiceApp(final ActorRef self, final SipServletRe
11721172
try {
11731173
formatedPhone = phoneNumberUtil.format(phoneNumberUtil.parse(phone, "US"), PhoneNumberFormat.E164);
11741174
} catch (NumberParseException e) {
1175-
if (logger.isInfoEnabled()) {
1175+
/*if (logger.isInfoEnabled()) {
11761176
String msg = String.format("Problem while trying to format number %s, exception %s ",phone, e);
11771177
logger.info(msg);
1178-
}
1178+
}*/
11791179
}
11801180
}
11811181
if (formatedPhone == null) {

0 commit comments

Comments
 (0)