Improve logging some random logging

Fixed logfile regex in gitignore
bigbluebutton · Aug 30, 2019 · 82931da · 82931da
1 parent fada488
commit 82931da
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ node_modules/*
 *swo
 *swp
 *~
-*log
+*log.*
diff --git a/lib/mcs-core/lib/adapters/freeswitch/freeswitch.js b/lib/mcs-core/lib/adapters/freeswitch/freeswitch.js
@@ -100,13 +100,11 @@ module.exports = class Freeswitch extends EventEmitter {
 
   _handleStartTalking (channelId) {
     const elementId = this._channelIdInfos[channelId].ua;
-    Logger.debug(LOG_PREFIX,'Emitting User agent',elementId,'start talking event');
     this.emit(C.EVENT.MEDIA_START_TALKING+elementId);
   }
 
   _handleStopTalking (channelId) {
     const elementId = this._channelIdInfos[channelId].ua;
-    Logger.debug(LOG_PREFIX,'Emitting User agent',elementId,'stop talking event');
     this.emit(C.EVENT.MEDIA_STOP_TALKING+elementId);
   }
 

diff --git a/lib/mcs-core/lib/adapters/kurento/kurento.js b/lib/mcs-core/lib/adapters/kurento/kurento.js
@@ -791,13 +791,11 @@ module.exports = class Kurento extends EventEmitter {
 
   processOffer (elementId, sdpOffer, params = {})  {
     const { replaceIp } = params;
-    Logger.trace(LOG_PREFIX, "Processing", elementId, "offer", sdpOffer);
-
     return new Promise((resolve, reject) => {
       try {
         const mediaElement = this._mediaElements[elementId];
-
         if (mediaElement) {
+          Logger.trace(LOG_PREFIX, `Processing ${elementId} offer`, { offer: sdpOffer });
           mediaElement.processOffer(sdpOffer, (error, answer) => {
             if (error) {
               return reject(this._handleError(error));
@@ -824,8 +822,8 @@ module.exports = class Kurento extends EventEmitter {
     return new Promise((resolve, reject) => {
       try {
         const mediaElement = this._mediaElements[elementId];
-
         if (mediaElement) {
+          Logger.trace(LOG_PREFIX, `Processing ${elementId} answer`, { answer });
           mediaElement.processAnswer(answer, (error, rAnswer) => {
             if (error) {
               return reject(this._handleError(error));
@@ -847,17 +845,15 @@ module.exports = class Kurento extends EventEmitter {
     return new Promise((resolve, reject) => {
       try {
         const mediaElement = this._mediaElements[elementId];
-
         if (mediaElement) {
           mediaElement.generateOffer((error, offer) => {
             if (error) {
               return reject(this._handleError(error));
             }
-
             filterOptions.forEach(({ reg, val }) => {
               offer = offer.replace(reg, val);
             });
-
+            Logger.trace(LOG_PREFIX, `Generated offer for ${elementId}`, { offer });
             return resolve(offer);
           });
         }

diff --git a/lib/mcs-core/lib/model/media.js b/lib/mcs-core/lib/model/media.js
@@ -316,7 +316,6 @@ module.exports = class Media {
       roomId: this.roomId,
       userId: this.userId,
     }
-    Logger.debug(LOG_PREFIX,"Dispatching start talking", event);
     GLOBAL_EVENT_EMITTER.emit(C.EVENT.MEDIA_START_TALKING, event);
   }
 
@@ -327,7 +326,6 @@ module.exports = class Media {
       roomId: this.roomId,
       userId: this.userId,
     }
-    Logger.debug(LOG_PREFIX,"Dispatching stop talking", event);
     GLOBAL_EVENT_EMITTER.emit(C.EVENT.MEDIA_STOP_TALKING, event);
   }
 

diff --git a/lib/mcs-core/lib/model/sdp-session.js b/lib/mcs-core/lib/model/sdp-session.js
@@ -190,8 +190,8 @@ module.exports = class SDPSession extends MediaSession {
         // I'll do it once I have time - prlanzarin 25/04/2018 FIXME
         if (this.remoteDescriptor.mainVideoSdp && this.shouldProcessRemoteDescriptorAsAnswerer) {
           try {
-            Logger.info(LOG_PREFIX, "Processing answerer video streams for", this.id);
             const videoMedia = this.medias.find(m => m.mediaTypes.video);
+            Logger.info(LOG_PREFIX, `Processing answerer video streams for session ${this.id} at media ${videoMedia.id}: ${this.remoteDescriptor.mainVideoSdp}`);
             const descBody = this.remoteDescriptor.removeSessionDescription(this.remoteDescriptor.mainVideoSdp);
             const mainWithInvalidAudio = this.remoteDescriptor.sessionDescriptionHeader + 'm=audio 0 RTP/AVP 96 97\n\ra=inactive\n\r' + descBody;
             await videoAdapter.processAnswer(videoMedia.adapterElementId, mainWithInvalidAudio);
@@ -203,8 +203,8 @@ module.exports = class SDPSession extends MediaSession {
 
         if (this.remoteDescriptor.audioSdp && this.shouldProcessRemoteDescriptorAsAnswerer) {
           try {
-            Logger.info(LOG_PREFIX, "Processing answerer audio streams for", this.id);
             const audioMedia = this.medias.find(m => m.mediaTypes.audio);
+            Logger.info(LOG_PREFIX, `Processing answerer audio streams for session ${this.id} at media ${audioMedia.id}: ${this.remoteDescriptor.audioSdp}`);
             const adescBody = this.remoteDescriptor.removeSessionDescription(this.remoteDescriptor.audioSdp);
             const mainWithInvalidVideo = this.remoteDescriptor.sessionDescriptionHeader + adescBody;
 
@@ -218,8 +218,8 @@ module.exports = class SDPSession extends MediaSession {
 
         if (this.remoteDescriptor.contentVideoSdp) {
           if (this.shouldProcessRemoteDescriptorAsAnswerer) {
-            Logger.info(LOG_PREFIX, `Processing answerer content streams for ${this.id} ${this.remoteDescriptor.contentVideoSdp}`);
             const contentMedia = this.medias.find(m => m.mediaTypes.content);
+            Logger.info(LOG_PREFIX, `Processing answerer content streams for session ${this.id} at media ${contentMedia.id}: ${this.remoteDescriptor.contentVideoSdp}`);
             const descBody = this.remoteDescriptor.removeSessionDescription(this.remoteDescriptor.contentVideoSdp);
             const contentWithInvalidAudio = this.remoteDescriptor.sessionDescriptionHeader + 'm=audio 0 RTP/AVP 96 97\n\ra=inactive\n\r' + descBody;
             await contentAdapter.processAnswer(contentMedia.adapterElementId, contentWithInvalidAudio);

diff --git a/lib/screenshare/screenshare.js b/lib/screenshare/screenshare.js
@@ -465,7 +465,7 @@ module.exports = class Screenshare extends BaseProvider {
         return resolve(sdpAnswer);
       }
       catch (err) {
-        Logger.error(LOG_PREFIX, "MCS veiwer subscribe returned error =>", err);
+        Logger.error(LOG_PREFIX, "MCS viewer subscribe returned error =>", err);
         return reject(this._handleError(LOG_PREFIX, err));
       }
     });
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ node_modules/* @@
     *swo
     *swp
     *~
-    *log
+    *log.*