瀏覽代碼

Changes console.* to logger.*

dev1
hristoterezov 9 年之前
父節點
當前提交
e6968912ae

+ 1
- 1
JitsiConference.js 查看文件

917
             conference.rtc.onIncommingCall(jingleSession);
917
             conference.rtc.onIncommingCall(jingleSession);
918
             jingleSession.acceptOffer(jingleOffer, null,
918
             jingleSession.acceptOffer(jingleOffer, null,
919
                 function (error) {
919
                 function (error) {
920
-                    console.error(
920
+                    logger.error(
921
                         "Failed to accept incoming Jingle session", error);
921
                         "Failed to accept incoming Jingle session", error);
922
                 }
922
                 }
923
             );
923
             );

+ 1
- 1
JitsiMeetJS.js 查看文件

191
      * (function(message, source, lineno, colno, error)).
191
      * (function(message, source, lineno, colno, error)).
192
      */
192
      */
193
     getGlobalOnErrorHandler: function (message, source, lineno, colno, error) {
193
     getGlobalOnErrorHandler: function (message, source, lineno, colno, error) {
194
-        console.error(
194
+        logger.error(
195
             'UnhandledError: ' + message,
195
             'UnhandledError: ' + message,
196
             'Script: ' + source,
196
             'Script: ' + source,
197
             'Line: ' + lineno,
197
             'Line: ' + lineno,

+ 2
- 2
modules/RTC/DataChannels.js 查看文件

184
     var upper = head.toUpperCase() + tail;
184
     var upper = head.toUpperCase() + tail;
185
 
185
 
186
     // Notify Videobridge about the specified endpoint change.
186
     // Notify Videobridge about the specified endpoint change.
187
-    console.log(lower + ' endpoint changed: ', userResource);
187
+    logger.log(lower + ' endpoint changed: ', userResource);
188
     this._some(function (dataChannel) {
188
     this._some(function (dataChannel) {
189
         if (dataChannel.readyState == 'open') {
189
         if (dataChannel.readyState == 'open') {
190
-            console.log(
190
+            logger.log(
191
                     'sending ' + lower
191
                     'sending ' + lower
192
                         + ' endpoint changed notification to the bridge: ',
192
                         + ' endpoint changed notification to the bridge: ',
193
                     userResource);
193
                     userResource);

+ 9
- 7
modules/RTC/RTCBrowserType.js 查看文件

1
+var logger = require("jitsi-meet-logger").getLogger(__filename);
2
+
1
 var currentBrowser;
3
 var currentBrowser;
2
 
4
 
3
 var browserVersion;
5
 var browserVersion;
82
         // We can assume that user agent is chrome, because it's
84
         // We can assume that user agent is chrome, because it's
83
         // enforced when 'ext' streaming method is set
85
         // enforced when 'ext' streaming method is set
84
         var ver = parseInt(userAgent.match(/chrome\/(\d+)\./)[1], 10);
86
         var ver = parseInt(userAgent.match(/chrome\/(\d+)\./)[1], 10);
85
-        console.log("This appears to be Chrome, ver: " + ver);
87
+        logger.log("This appears to be Chrome, ver: " + ver);
86
         return ver;
88
         return ver;
87
     }
89
     }
88
     return null;
90
     return null;
93
     if (userAgent.match(/Opera|OPR/)) {
95
     if (userAgent.match(/Opera|OPR/)) {
94
         currentBrowser = RTCBrowserType.RTC_BROWSER_OPERA;
96
         currentBrowser = RTCBrowserType.RTC_BROWSER_OPERA;
95
         var version = userAgent.match(/(Opera|OPR) ?\/?(\d+)\.?/)[2];
97
         var version = userAgent.match(/(Opera|OPR) ?\/?(\d+)\.?/)[2];
96
-        console.info("This appears to be Opera, ver: " + version);
98
+        logger.info("This appears to be Opera, ver: " + version);
97
         return version;
99
         return version;
98
     }
100
     }
99
     return null;
101
     return null;
104
         currentBrowser = RTCBrowserType.RTC_BROWSER_FIREFOX;
106
         currentBrowser = RTCBrowserType.RTC_BROWSER_FIREFOX;
105
         var version = parseInt(
107
         var version = parseInt(
106
             navigator.userAgent.match(/Firefox\/([0-9]+)\./)[1], 10);
108
             navigator.userAgent.match(/Firefox\/([0-9]+)\./)[1], 10);
107
-        console.log('This appears to be Firefox, ver: ' + version);
109
+        logger.log('This appears to be Firefox, ver: ' + version);
108
         return version;
110
         return version;
109
     }
111
     }
110
     return null;
112
     return null;
113
 function detectSafari() {
115
 function detectSafari() {
114
     if ((/^((?!chrome).)*safari/i.test(navigator.userAgent))) {
116
     if ((/^((?!chrome).)*safari/i.test(navigator.userAgent))) {
115
         currentBrowser = RTCBrowserType.RTC_BROWSER_SAFARI;
117
         currentBrowser = RTCBrowserType.RTC_BROWSER_SAFARI;
116
-        console.info("This appears to be Safari");
118
+        logger.info("This appears to be Safari");
117
         // FIXME detect Safari version when needed
119
         // FIXME detect Safari version when needed
118
         return 1;
120
         return 1;
119
     }
121
     }
145
 
147
 
146
     if (version) {
148
     if (version) {
147
         currentBrowser = RTCBrowserType.RTC_BROWSER_IEXPLORER;
149
         currentBrowser = RTCBrowserType.RTC_BROWSER_IEXPLORER;
148
-        console.info("This appears to be IExplorer, ver: " + version);
150
+        logger.info("This appears to be IExplorer, ver: " + version);
149
     }
151
     }
150
     return version;
152
     return version;
151
 }
153
 }
155
     if (userAgent.match(/JitsiMeetNW/)) {
157
     if (userAgent.match(/JitsiMeetNW/)) {
156
         currentBrowser = RTCBrowserType.RTC_BROWSER_NWJS;
158
         currentBrowser = RTCBrowserType.RTC_BROWSER_NWJS;
157
         var version = userAgent.match(/JitsiMeetNW\/([\d.]+)/)[1];
159
         var version = userAgent.match(/JitsiMeetNW\/([\d.]+)/)[1];
158
-        console.info("This appears to be JitsiMeetNW, ver: " + version);
160
+        logger.info("This appears to be JitsiMeetNW, ver: " + version);
159
         return version;
161
         return version;
160
     }
162
     }
161
     return null;
163
     return null;
177
         if (version)
179
         if (version)
178
             return version;
180
             return version;
179
     }
181
     }
180
-    console.warn("Browser type defaults to Safari ver 1");
182
+    logger.warn("Browser type defaults to Safari ver 1");
181
     currentBrowser = RTCBrowserType.RTC_BROWSER_SAFARI;
183
     currentBrowser = RTCBrowserType.RTC_BROWSER_SAFARI;
182
     return 1;
184
     return 1;
183
 }
185
 }

+ 1
- 1
modules/RTC/RTCUtils.js 查看文件

389
 
389
 
390
                 callback(devices);
390
                 callback(devices);
391
             }, function (err) {
391
             }, function (err) {
392
-                console.error('cannot enumerate devices: ', err);
392
+                logger.error('cannot enumerate devices: ', err);
393
 
393
 
394
                 // return only auto devices
394
                 // return only auto devices
395
                 callback([
395
                 callback([

+ 1
- 1
modules/statistics/RTPStatsCollector.js 查看文件

501
             key = 'packetsSent';
501
             key = 'packetsSent';
502
             packetsNow = getStatValue(now, key);
502
             packetsNow = getStatValue(now, key);
503
             if (typeof packetsNow === 'undefined' || packetsNow === null) {
503
             if (typeof packetsNow === 'undefined' || packetsNow === null) {
504
-                console.warn("No packetsReceived nor packetsSent stat found");
504
+                logger.warn("No packetsReceived nor packetsSent stat found");
505
                 continue;
505
                 continue;
506
             }
506
             }
507
         }
507
         }

+ 2
- 2
modules/xmpp/TraceablePeerConnection.js 查看文件

155
 TraceablePeerConnection.prototype.ssrcReplacement = function (desc) {
155
 TraceablePeerConnection.prototype.ssrcReplacement = function (desc) {
156
     if (typeof desc !== 'object' || desc === null ||
156
     if (typeof desc !== 'object' || desc === null ||
157
         typeof desc.sdp !== 'string') {
157
         typeof desc.sdp !== 'string') {
158
-        console.warn('An empty description was passed as an argument.');
158
+        logger.warn('An empty description was passed as an argument.');
159
         return desc;
159
         return desc;
160
     }
160
     }
161
 
161
 
308
 function extractSSRCMap(desc) {
308
 function extractSSRCMap(desc) {
309
     if (typeof desc !== 'object' || desc === null ||
309
     if (typeof desc !== 'object' || desc === null ||
310
         typeof desc.sdp !== 'string') {
310
         typeof desc.sdp !== 'string') {
311
-        console.warn('An empty description was passed as an argument.');
311
+        logger.warn('An empty description was passed as an argument.');
312
         return desc;
312
         return desc;
313
     }
313
     }
314
 
314
 

+ 1
- 1
modules/xmpp/moderator.js 查看文件

259
             '>conference>property' +
259
             '>conference>property' +
260
             '[name=\'externalAuth\'][value=\'true\']').length > 0;
260
             '[name=\'externalAuth\'][value=\'true\']').length > 0;
261
 
261
 
262
-    console.info(
262
+    logger.info(
263
         'External authentication enabled: ' + this.externalAuthEnabled);
263
         'External authentication enabled: ' + this.externalAuthEnabled);
264
 
264
 
265
     if (!this.externalAuthEnabled) {
265
     if (!this.externalAuthEnabled) {

Loading…
取消
儲存