Skip to content

Commit

Permalink
RestComm#977
Browse files Browse the repository at this point in the history 
Use Guarded Logging for:
restcomm.mscontrol.jsr309
restcomm.mscontrol.mss
restcomm.provisioning.number.bandwidth
restcomm.sms
restcomm.telephony
restcomm.telephony.api
restcomm.tts.acapela
restcomm.tts.api
restcomm.tts.voicerss
restcomm.ussd
  • Loading branch information
@zahidMed
zahidMed authored and emedzid committed May 12, 2016
1 parent 5470782 commit e128c29
Show file tree
Hide file tree
Showing 29 changed files with 828 additions and 289 deletions.
43 changes: 30 additions & 13 deletions ...src/main/java/org/mobicents/servlet/restcomm/mscontrol/jsr309/Jsr309BridgeController.java
View file
Expand Up @@ -212,9 +212,12 @@ public void setEndOnKey(String endOnKey) {
public void onEvent(RecorderEvent event) {
EventType eventType = event.getEventType();

logger.info("********** Bridge Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Bridge Controller Processing Event: \"RecorderEvent\" (type = " + eventType + ")");

if(logger.isInfoEnabled())
{
logger.info("********** Bridge Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Bridge Controller Processing Event: \"RecorderEvent\" (type = " + eventType + ")");
}

if (RecorderEvent.RECORD_COMPLETED.equals(eventType)) {
MediaGroupResponse<String> response = null;
if (event.isSuccessful()) {
Expand Down Expand Up @@ -256,11 +259,17 @@ private void saveRecording() {
}

if (duration.equals(0.0)) {
logger.info("Call wraping up recording. File doesn't exist since duration is 0");
if(logger.isInfoEnabled())
{
logger.info("Call wraping up recording. File doesn't exist since duration is 0");
}
final DateTime end = DateTime.now();
duration = new Double((end.getMillis() - recordingStarted.getMillis()) / 1000);
} else {
logger.info("Call wraping up recording. File already exists, length: " + (new File(recordingUri).length()));
if(logger.isInfoEnabled())
{
logger.info("Call wraping up recording. File already exists, length: " + (new File(recordingUri).length()));
}
}

final Recording.Builder builder = Recording.builder();
Expand Down Expand Up @@ -288,10 +297,12 @@ private class MixerAllocationListener implements AllocationEventListener, Serial
@Override
public void onEvent(AllocationEvent event) {
EventType eventType = event.getEventType();

logger.info("********** Bridge Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Bridge Controller Processing Event: \"AllocationEventListener - Mixer\" (type = "
+ eventType + ")");
if(logger.isInfoEnabled())
{
logger.info("********** Bridge Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Bridge Controller Processing Event: \"AllocationEventListener - Mixer\" (type = "
+ eventType + ")");
}

try {
if (AllocationEvent.ALLOCATION_CONFIRMED.equals(eventType)) {
Expand Down Expand Up @@ -328,9 +339,12 @@ public void onReceive(Object message) throws Exception {
final ActorRef sender = sender();
final State state = fsm.state();

logger.info("********** Bridge Controller " + self().path() + " State: \"" + state.toString());
logger.info("********** Bridge Controller " + self().path() + " Processing: \"" + klass.getName() + " Sender: "
+ sender.getClass());
if(logger.isInfoEnabled())
{
logger.info("********** Bridge Controller " + self().path() + " State: \"" + state.toString());
logger.info("********** Bridge Controller " + self().path() + " Processing: \"" + klass.getName() + " Sender: "
+ sender.getClass());
}

if (Observe.class.equals(klass)) {
onObserve((Observe) message, self, sender);
Expand Down Expand Up @@ -386,7 +400,10 @@ private void onStop(Stop message, ActorRef self, ActorRef sender) throws Excepti
private void onStartRecording(StartRecording message, ActorRef self, ActorRef sender) throws Exception {
if (is(active)) {
try {
logger.info("Start recording bridged call");
if(logger.isInfoEnabled())
{
logger.info("Start recording bridged call");
}

Parameters params = this.mediaGroup.createParameters();

Expand Down
68 changes: 47 additions & 21 deletions ...9/src/main/java/org/mobicents/servlet/restcomm/mscontrol/jsr309/Jsr309CallController.java
View file
Expand Up @@ -253,9 +253,12 @@ private final class SdpListener extends MediaListener<SdpPortManagerEvent> {
public void onEvent(SdpPortManagerEvent event) {
EventType eventType = event.getEventType();

logger.info("********** Call Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Call Controller Processing Event: \"SdpPortManagerEvent\" (type = " + eventType + ")");

if(logger.isInfoEnabled())
{
logger.info("********** Call Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Call Controller Processing Event: \"SdpPortManagerEvent\" (type = " + eventType + ")");
}

try {
if (event.isSuccessful()) {
if (is(initializing) || is(updatingMediaSession)) {
Expand Down Expand Up @@ -321,9 +324,11 @@ private final class PlayerListener extends MediaListener<PlayerEvent> {
public void onEvent(PlayerEvent event) {
EventType eventType = event.getEventType();

logger.info("********** Call Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Call Controller Processing Event: \"PlayerEvent\" (type = " + eventType + ")");

if(logger.isInfoEnabled())
{
logger.info("********** Call Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Call Controller Processing Event: \"PlayerEvent\" (type = " + eventType + ")");
}
if (PlayerEvent.PLAY_COMPLETED.equals(eventType)) {
MediaGroupResponse<String> response;
if (event.isSuccessful()) {
Expand All @@ -348,9 +353,12 @@ private final class DtmfListener extends MediaListener<SignalDetectorEvent> {
public void onEvent(SignalDetectorEvent event) {
EventType eventType = event.getEventType();

logger.info("********** Call Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Call Controller Processing Event: \"SignalDetectorEvent\" (type = " + eventType + ")");

if(logger.isInfoEnabled())
{
logger.info("********** Call Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Call Controller Processing Event: \"SignalDetectorEvent\" (type = " + eventType + ")");
}

if (SignalDetectorEvent.RECEIVE_SIGNALS_COMPLETED.equals(eventType)) {
MediaGroupResponse<String> response;
if (event.isSuccessful()) {
Expand Down Expand Up @@ -381,9 +389,12 @@ public void setEndOnKey(String endOnKey) {
public void onEvent(RecorderEvent event) {
EventType eventType = event.getEventType();

logger.info("********** Call Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Call Controller Processing Event: \"RecorderEvent\" (type = " + eventType + ")");

if(logger.isInfoEnabled())
{
logger.info("********** Call Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Call Controller Processing Event: \"RecorderEvent\" (type = " + eventType + ")");
}

if (RecorderEvent.RECORD_COMPLETED.equals(eventType)) {
MediaGroupResponse<String> response = null;
if (event.isSuccessful()) {
Expand Down Expand Up @@ -415,9 +426,12 @@ public void onReceive(Object message) throws Exception {
final ActorRef sender = sender();
final State state = fsm.state();

logger.info("********** Call Controller Current State: \"" + state.toString());
logger.info("********** Call Controller Processing Message: \"" + klass.getName() + " sender : " + sender.getClass());

if(logger.isInfoEnabled())
{
logger.info("********** Call Controller Current State: \"" + state.toString());
logger.info("********** Call Controller Processing Message: \"" + klass.getName() + " sender : " + sender.getClass());
}

if (Observe.class.equals(klass)) {
onObserve((Observe) message, self, sender);
} else if (StopObserving.class.equals(klass)) {
Expand Down Expand Up @@ -562,7 +576,10 @@ private void onStartRecordingCall(StartRecording message, ActorRef self, ActorRe
this.recordingUri = message.getRecordingUri();
this.recording = true;

logger.info("Start recording call");
if(logger.isInfoEnabled())
{
logger.info("Start recording call");
}
this.recordStarted = DateTime.now();

// Tell media group to start recording
Expand All @@ -586,7 +603,10 @@ private void onStopRecordingCall(StopRecording message, ActorRef self, ActorRef
}

// Tell media group to stop recording
logger.info("Stop recording call");
if(logger.isInfoEnabled())
{
logger.info("Stop recording call");
}
onStop(new Stop(false), self, sender);
}
}
Expand Down Expand Up @@ -764,12 +784,18 @@ private void onStop(Stop message, ActorRef self, ActorRef sender) {
duration = 0.0;
}
if (duration.equals(0.0)) {
logger.info("Call wraping up recording. File doesn't exist since duration is 0");
final DateTime end = DateTime.now();
if(logger.isInfoEnabled())
{
logger.info("Call wraping up recording. File doesn't exist since duration is 0");
}
final DateTime end = DateTime.now();
duration = new Double((end.getMillis() - recordStarted.getMillis()) / 1000);
} else {
logger.info("Call wraping up recording. File already exists, length: "
+ (new File(recordingUri).length()));
if(logger.isInfoEnabled())
{
logger.info("Call wraping up recording. File already exists, length: "
+ (new File(recordingUri).length()));
}
}
final Recording.Builder builder = Recording.builder();
builder.setSid(recordingSid);
Expand Down
29 changes: 19 additions & 10 deletions ...main/java/org/mobicents/servlet/restcomm/mscontrol/jsr309/Jsr309ConferenceController.java
View file
Expand Up @@ -199,9 +199,12 @@ private final class PlayerListener extends MediaListener<PlayerEvent> {
public void onEvent(PlayerEvent event) {
EventType eventType = event.getEventType();

logger.info("********** Conference Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Conference Controller Processing Event: \"PlayerEvent\" (type = " + eventType + ")");

if(logger.isInfoEnabled())
{
logger.info("********** Conference Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Conference Controller Processing Event: \"PlayerEvent\" (type = " + eventType + ")");
}

if (PlayerEvent.PLAY_COMPLETED.equals(eventType)) {
MediaGroupResponse<String> response;
if (event.isSuccessful()) {
Expand All @@ -226,10 +229,13 @@ private class MixerAllocationListener implements AllocationEventListener, Serial
public void onEvent(AllocationEvent event) {
EventType eventType = event.getEventType();

logger.info("********** Conference Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Conference Controller Processing Event: \"AllocationEventListener - Mixer\" (type = "
+ eventType + ")");

if(logger.isInfoEnabled())
{
logger.info("********** Conference Controller Current State: \"" + fsm.state().toString() + "\"");
logger.info("********** Conference Controller Processing Event: \"AllocationEventListener - Mixer\" (type = "
+ eventType + ")");
}

try {
if (AllocationEvent.ALLOCATION_CONFIRMED.equals(eventType)) {
// No need to be notified anymore
Expand Down Expand Up @@ -265,9 +271,12 @@ public void onReceive(Object message) throws Exception {
final ActorRef sender = sender();
final State state = fsm.state();

logger.info("********** Conference Controller Current State: \"" + state.toString());
logger.info("********** Conference Controller Processing Message: \"" + klass.getName() + " sender : "
+ sender.getClass());
if(logger.isInfoEnabled())
{
logger.info("********** Conference Controller Current State: \"" + state.toString());
logger.info("********** Conference Controller Processing Message: \"" + klass.getName() + " sender : "
+ sender.getClass());
}

if (Observe.class.equals(klass)) {
onObserve((Observe) message, self, sender);
Expand Down

0 comments on commit e128c29

Please sign in to comment.