Quellcode durchsuchen

logging: use individual, names loggers

React Native doesn't define __filename nor __dirname so do it artisanally. In
addition, this helps with centralizing the configuration passed to loggers.
master
Saúl Ibarra Corretgé vor 5 Jahren
Ursprung
Commit
5a934c071a
100 geänderte Dateien mit 268 neuen und 116 gelöschten Zeilen
  1. 2
    1
      react/features/always-on-top/AudioMuteButton.js
  2. 2
    1
      react/features/always-on-top/VideoMuteButton.js
  3. 3
    0
      react/features/always-on-top/logger.js
  4. 1
    2
      react/features/analytics/functions.js
  5. 5
    0
      react/features/analytics/logger.js
  6. 1
    2
      react/features/app/actions.js
  7. 1
    2
      react/features/app/components/App.native.js
  8. 5
    0
      react/features/app/logger.js
  9. 1
    2
      react/features/authentication/actions.js
  10. 5
    0
      react/features/authentication/logger.js
  11. 1
    2
      react/features/base/app/components/BaseApp.js
  12. 5
    0
      react/features/base/app/logger.js
  13. 1
    4
      react/features/base/audio-only/actions.js
  14. 5
    0
      react/features/base/audio-only/logger.js
  15. 3
    3
      react/features/base/conference/actions.js
  16. 1
    2
      react/features/base/conference/functions.js
  17. 5
    0
      react/features/base/conference/logger.js
  18. 1
    2
      react/features/base/conference/middleware.js
  19. 1
    2
      react/features/base/config/functions.any.js
  20. 5
    0
      react/features/base/config/logger.js
  21. 1
    2
      react/features/base/connection/actions.native.js
  22. 1
    2
      react/features/base/connection/actions.web.js
  23. 5
    0
      react/features/base/connection/logger.js
  24. 1
    2
      react/features/base/devices/actions.js
  25. 5
    0
      react/features/base/devices/logger.js
  26. 1
    2
      react/features/base/devices/middleware.js
  27. 1
    1
      react/features/base/dialog/components/web/DialogWithTabs.js
  28. 5
    0
      react/features/base/dialog/logger.js
  29. 5
    0
      react/features/base/lastn/logger.js
  30. 2
    3
      react/features/base/lastn/middleware.js
  31. 1
    2
      react/features/base/lib-jitsi-meet/functions.js
  32. 5
    0
      react/features/base/lib-jitsi-meet/logger.js
  33. 1
    1
      react/features/base/lib-jitsi-meet/native/RTCPeerConnection.js
  34. 22
    0
      react/features/base/logging/functions.js
  35. 1
    0
      react/features/base/logging/index.js
  36. 1
    1
      react/features/base/media/components/AbstractAudio.js
  37. 2
    2
      react/features/base/media/components/native/Audio.js
  38. 5
    0
      react/features/base/media/logger.js
  39. 1
    2
      react/features/base/media/middleware.js
  40. 2
    2
      react/features/base/react/components/web/MultiSelectAutocomplete.js
  41. 5
    0
      react/features/base/react/logger.js
  42. 1
    1
      react/features/base/redux/StateListenerRegistry.js
  43. 5
    0
      react/features/base/redux/logger.js
  44. 5
    0
      react/features/base/settings/logger.js
  45. 1
    2
      react/features/base/settings/reducer.js
  46. 5
    0
      react/features/base/sounds/logger.js
  47. 1
    2
      react/features/base/sounds/middleware.js
  48. 1
    2
      react/features/base/sounds/reducer.js
  49. 1
    1
      react/features/base/storage/PersistenceRegistry.js
  50. 5
    0
      react/features/base/storage/logger.js
  51. 5
    0
      react/features/base/testing/logger.js
  52. 2
    5
      react/features/base/testing/middleware.js
  53. 1
    2
      react/features/base/tracks/actions.js
  54. 1
    1
      react/features/base/tracks/functions.js
  55. 5
    0
      react/features/base/tracks/logger.js
  56. 1
    1
      react/features/base/util/helpers.js
  57. 1
    1
      react/features/base/util/httpUtils.js
  58. 5
    0
      react/features/base/util/logger.js
  59. 1
    1
      react/features/base/util/uri.js
  60. 1
    2
      react/features/blur/actions.js
  61. 5
    0
      react/features/blur/logger.js
  62. 1
    2
      react/features/calendar-sync/actions.web.js
  63. 1
    2
      react/features/calendar-sync/functions.native.js
  64. 1
    1
      react/features/calendar-sync/functions.web.js
  65. 5
    0
      react/features/calendar-sync/logger.js
  66. 1
    3
      react/features/conference/components/web/Conference.js
  67. 5
    0
      react/features/conference/logger.js
  68. 1
    1
      react/features/desktop-picker/functions.js
  69. 5
    0
      react/features/desktop-picker/logger.js
  70. 1
    2
      react/features/device-selection/actions.js
  71. 2
    2
      react/features/device-selection/components/DeviceSelection.js
  72. 5
    0
      react/features/device-selection/logger.js
  73. 1
    2
      react/features/dropbox/functions.any.js
  74. 5
    0
      react/features/dropbox/logger.js
  75. 5
    0
      react/features/follow-me/logger.js
  76. 1
    2
      react/features/follow-me/middleware.js
  77. 1
    2
      react/features/invite/actions.js
  78. 1
    1
      react/features/invite/components/add-people-dialog/AbstractAddPeopleDialog.js
  79. 1
    2
      react/features/invite/components/info-dialog/web/InfoDialog.js
  80. 2
    2
      react/features/invite/functions.js
  81. 5
    0
      react/features/invite/logger.js
  82. 1
    2
      react/features/invite/middleware.any.js
  83. 1
    2
      react/features/invite/reducer.js
  84. 1
    2
      react/features/local-recording/controller/RecordingController.js
  85. 5
    0
      react/features/local-recording/logger.js
  86. 1
    2
      react/features/local-recording/recording/AbstractAudioContextAdapter.js
  87. 1
    2
      react/features/local-recording/recording/OggAdapter.js
  88. 1
    2
      react/features/local-recording/recording/WavAdapter.js
  89. 1
    2
      react/features/local-recording/recording/flac/FlacAdapter.js
  90. 1
    2
      react/features/local-recording/recording/flac/flacEncodeWorker.js
  91. 1
    1
      react/features/local-recording/session/SessionManager.js
  92. 5
    0
      react/features/mobile/audio-mode/logger.js
  93. 1
    1
      react/features/mobile/audio-mode/middleware.js
  94. 1
    2
      react/features/mobile/picture-in-picture/actions.js
  95. 5
    0
      react/features/mobile/picture-in-picture/logger.js
  96. 5
    0
      react/features/mobile/watchos/logger.js
  97. 1
    2
      react/features/mobile/watchos/middleware.js
  98. 1
    2
      react/features/overlay/components/AbstractPageReloadOverlay.js
  99. 5
    0
      react/features/overlay/logger.js
  100. 0
    0
      react/features/recent-list/logger.js

+ 2
- 1
react/features/always-on-top/AudioMuteButton.js Datei anzeigen

5
 import AbstractAudioMuteButton from '../base/toolbox/components/AbstractAudioMuteButton';
5
 import AbstractAudioMuteButton from '../base/toolbox/components/AbstractAudioMuteButton';
6
 import type { Props } from '../base/toolbox/components/AbstractButton';
6
 import type { Props } from '../base/toolbox/components/AbstractButton';
7
 
7
 
8
+import logger from './logger';
9
+
8
 const { api } = window.alwaysOnTop;
10
 const { api } = window.alwaysOnTop;
9
-const logger = require('jitsi-meet-logger').getLogger(__filename);
10
 
11
 
11
 /**
12
 /**
12
  * The type of the React {@code Component} state of {@link AudioMuteButton}.
13
  * The type of the React {@code Component} state of {@link AudioMuteButton}.

+ 2
- 1
react/features/always-on-top/VideoMuteButton.js Datei anzeigen

5
 import AbstractVideoMuteButton from '../base/toolbox/components/AbstractVideoMuteButton';
5
 import AbstractVideoMuteButton from '../base/toolbox/components/AbstractVideoMuteButton';
6
 import type { Props } from '../base/toolbox/components/AbstractButton';
6
 import type { Props } from '../base/toolbox/components/AbstractButton';
7
 
7
 
8
+import logger from './logger';
9
+
8
 const { api } = window.alwaysOnTop;
10
 const { api } = window.alwaysOnTop;
9
-const logger = require('jitsi-meet-logger').getLogger(__filename);
10
 
11
 
11
 /**
12
 /**
12
  * The type of the React {@code Component} state of {@link VideoMuteButton}.
13
  * The type of the React {@code Component} state of {@link VideoMuteButton}.

+ 3
- 0
react/features/always-on-top/logger.js Datei anzeigen

1
+import { getLogger } from '../base/logging/functions';
2
+
3
+export default getLogger('features/always-on-top');

+ 1
- 2
react/features/analytics/functions.js Datei anzeigen

7
 import { getJitsiMeetGlobalNS, loadScript } from '../base/util';
7
 import { getJitsiMeetGlobalNS, loadScript } from '../base/util';
8
 
8
 
9
 import { AmplitudeHandler } from './handlers';
9
 import { AmplitudeHandler } from './handlers';
10
-
11
-const logger = require('jitsi-meet-logger').getLogger(__filename);
10
+import logger from './logger';
12
 
11
 
13
 /**
12
 /**
14
  * Sends an event through the lib-jitsi-meet AnalyticsAdapter interface.
13
  * Sends an event through the lib-jitsi-meet AnalyticsAdapter interface.

+ 5
- 0
react/features/analytics/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/analytics');

+ 1
- 2
react/features/app/actions.js Datei anzeigen

25
     getDefaultURL,
25
     getDefaultURL,
26
     getName
26
     getName
27
 } from './functions';
27
 } from './functions';
28
-
29
-const logger = require('jitsi-meet-logger').getLogger(__filename);
28
+import logger from './logger';
30
 
29
 
31
 declare var APP: Object;
30
 declare var APP: Object;
32
 
31
 

+ 1
- 2
react/features/app/components/App.native.js Datei anzeigen

27
 import '../../mobile/wake-lock';
27
 import '../../mobile/wake-lock';
28
 import '../../mobile/watchos';
28
 import '../../mobile/watchos';
29
 
29
 
30
+import logger from '../logger';
30
 import { AbstractApp } from './AbstractApp';
31
 import { AbstractApp } from './AbstractApp';
31
 import type { Props as AbstractAppProps } from './AbstractApp';
32
 import type { Props as AbstractAppProps } from './AbstractApp';
32
 
33
 
33
 declare var __DEV__;
34
 declare var __DEV__;
34
 
35
 
35
-const logger = require('jitsi-meet-logger').getLogger(__filename);
36
-
37
 /**
36
 /**
38
  * The type of React {@code Component} props of {@link App}.
37
  * The type of React {@code Component} props of {@link App}.
39
  */
38
  */

+ 5
- 0
react/features/app/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/app');

+ 1
- 2
react/features/authentication/actions.js Datei anzeigen

16
     WAIT_FOR_OWNER
16
     WAIT_FOR_OWNER
17
 } from './actionTypes';
17
 } from './actionTypes';
18
 import { LoginDialog, WaitForOwnerDialog } from './components';
18
 import { LoginDialog, WaitForOwnerDialog } from './components';
19
-
20
-const logger = require('jitsi-meet-logger').getLogger(__filename);
19
+import logger from './logger';
21
 
20
 
22
 /**
21
 /**
23
  * Initiates authenticating and upgrading the role of the local participant to
22
  * Initiates authenticating and upgrading the role of the local participant to

+ 5
- 0
react/features/authentication/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/authentication');

+ 1
- 2
react/features/base/app/components/BaseApp.js Datei anzeigen

17
 import { PersistenceRegistry } from '../../storage';
17
 import { PersistenceRegistry } from '../../storage';
18
 
18
 
19
 import { appWillMount, appWillUnmount } from '../actions';
19
 import { appWillMount, appWillUnmount } from '../actions';
20
-
21
-const logger = require('jitsi-meet-logger').getLogger(__filename);
20
+import logger from '../logger';
22
 
21
 
23
 declare var APP: Object;
22
 declare var APP: Object;
24
 
23
 

+ 5
- 0
react/features/base/app/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/app');

+ 1
- 4
react/features/base/audio-only/actions.js Datei anzeigen

1
 // @flow
1
 // @flow
2
 
2
 
3
-import { getLogger } from 'jitsi-meet-logger';
4
-
5
 import UIEvents from '../../../../service/UI/UIEvents';
3
 import UIEvents from '../../../../service/UI/UIEvents';
6
 
4
 
7
 import { createAudioOnlyChangedEvent, sendAnalytics } from '../../analytics';
5
 import { createAudioOnlyChangedEvent, sendAnalytics } from '../../analytics';
8
 
6
 
9
 import { SET_AUDIO_ONLY } from './actionTypes';
7
 import { SET_AUDIO_ONLY } from './actionTypes';
8
+import logger from './logger';
10
 
9
 
11
 import type { Dispatch } from 'redux';
10
 import type { Dispatch } from 'redux';
12
 
11
 
13
 declare var APP: Object;
12
 declare var APP: Object;
14
-const logger = getLogger('features/base/audio-only');
15
-
16
 
13
 
17
 /**
14
 /**
18
  * Sets the audio-only flag for the current JitsiConference.
15
  * Sets the audio-only flag for the current JitsiConference.

+ 5
- 0
react/features/base/audio-only/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/audio-only');

+ 3
- 3
react/features/base/conference/actions.js Datei anzeigen

1
 // @flow
1
 // @flow
2
 
2
 
3
+import type { Dispatch } from 'redux';
4
+
3
 import {
5
 import {
4
     createStartMutedConfigurationEvent,
6
     createStartMutedConfigurationEvent,
5
     sendAnalytics
7
     sendAnalytics
58
     getCurrentConference,
60
     getCurrentConference,
59
     sendLocalParticipant
61
     sendLocalParticipant
60
 } from './functions';
62
 } from './functions';
61
-import type { Dispatch } from 'redux';
62
-
63
-const logger = require('jitsi-meet-logger').getLogger(__filename);
63
+import logger from './logger';
64
 
64
 
65
 declare var APP: Object;
65
 declare var APP: Object;
66
 
66
 

+ 1
- 2
react/features/base/conference/functions.js Datei anzeigen

19
     JITSI_CONFERENCE_URL_KEY,
19
     JITSI_CONFERENCE_URL_KEY,
20
     VIDEO_QUALITY_LEVELS
20
     VIDEO_QUALITY_LEVELS
21
 } from './constants';
21
 } from './constants';
22
-
23
-const logger = require('jitsi-meet-logger').getLogger(__filename);
22
+import logger from './logger';
24
 
23
 
25
 /**
24
 /**
26
  * Attach a set of local tracks to a conference.
25
  * Attach a set of local tracks to a conference.

+ 5
- 0
react/features/base/conference/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/conference');

+ 1
- 2
react/features/base/conference/middleware.js Datei anzeigen

41
     forEachConference,
41
     forEachConference,
42
     getCurrentConference
42
     getCurrentConference
43
 } from './functions';
43
 } from './functions';
44
-
45
-const logger = require('jitsi-meet-logger').getLogger(__filename);
44
+import logger from './logger';
46
 
45
 
47
 declare var APP: Object;
46
 declare var APP: Object;
48
 
47
 

+ 1
- 2
react/features/base/config/functions.any.js Datei anzeigen

4
 
4
 
5
 import { _CONFIG_STORE_PREFIX } from './constants';
5
 import { _CONFIG_STORE_PREFIX } from './constants';
6
 import parseURLParams from './parseURLParams';
6
 import parseURLParams from './parseURLParams';
7
+import logger from './logger';
7
 
8
 
8
 declare var $: Object;
9
 declare var $: Object;
9
 
10
 
147
     'webrtcIceUdpDisable'
148
     'webrtcIceUdpDisable'
148
 ];
149
 ];
149
 
150
 
150
-const logger = require('jitsi-meet-logger').getLogger(__filename);
151
-
152
 // XXX The functions getRoomName and parseURLParams are split out of
151
 // XXX The functions getRoomName and parseURLParams are split out of
153
 // functions.js because they are bundled in both app.bundle and
152
 // functions.js because they are bundled in both app.bundle and
154
 // do_external_connect, webpack 1 does not support tree shaking, and we don't
153
 // do_external_connect, webpack 1 does not support tree shaking, and we don't

+ 5
- 0
react/features/base/config/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/config');

+ 1
- 2
react/features/base/connection/actions.native.js Datei anzeigen

19
     SET_LOCATION_URL
19
     SET_LOCATION_URL
20
 } from './actionTypes';
20
 } from './actionTypes';
21
 import { JITSI_CONNECTION_URL_KEY } from './constants';
21
 import { JITSI_CONNECTION_URL_KEY } from './constants';
22
-
23
-const logger = require('jitsi-meet-logger').getLogger(__filename);
22
+import logger from './logger';
24
 
23
 
25
 /**
24
 /**
26
  * The error structure passed to the {@link connectionFailed} action.
25
  * The error structure passed to the {@link connectionFailed} action.

+ 1
- 2
react/features/base/connection/actions.web.js Datei anzeigen

5
 declare var APP: Object;
5
 declare var APP: Object;
6
 declare var config: Object;
6
 declare var config: Object;
7
 
7
 
8
-const logger = require('jitsi-meet-logger').getLogger(__filename);
9
-
10
 import { configureInitialDevices } from '../devices';
8
 import { configureInitialDevices } from '../devices';
11
 
9
 
12
 export {
10
 export {
14
     connectionFailed,
12
     connectionFailed,
15
     setLocationURL
13
     setLocationURL
16
 } from './actions.native';
14
 } from './actions.native';
15
+import logger from './logger';
17
 
16
 
18
 /**
17
 /**
19
  * Opens new connection.
18
  * Opens new connection.

+ 5
- 0
react/features/base/connection/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/connection');

+ 1
- 2
react/features/base/devices/actions.js Datei anzeigen

20
     getDevicesFromURL,
20
     getDevicesFromURL,
21
     setAudioOutputDeviceId
21
     setAudioOutputDeviceId
22
 } from './functions';
22
 } from './functions';
23
-
24
-const logger = require('jitsi-meet-logger').getLogger(__filename);
23
+import logger from './logger';
25
 
24
 
26
 /**
25
 /**
27
  * Maps the WebRTC string for device type to the keys used to store configure,
26
  * Maps the WebRTC string for device type to the keys used to store configure,

+ 5
- 0
react/features/base/devices/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/devices');

+ 1
- 2
react/features/base/devices/middleware.js Datei anzeigen

21
 import { showNotification, showWarningNotification } from '../../notifications';
21
 import { showNotification, showWarningNotification } from '../../notifications';
22
 import { updateSettings } from '../settings';
22
 import { updateSettings } from '../settings';
23
 import { setAudioOutputDeviceId } from './functions';
23
 import { setAudioOutputDeviceId } from './functions';
24
-
25
-const logger = require('jitsi-meet-logger').getLogger(__filename);
24
+import logger from './logger';
26
 
25
 
27
 const JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP = {
26
 const JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP = {
28
     microphone: {
27
     microphone: {

+ 1
- 1
react/features/base/dialog/components/web/DialogWithTabs.js Datei anzeigen

6
 import { StatelessDialog } from '../../../dialog';
6
 import { StatelessDialog } from '../../../dialog';
7
 import { translate } from '../../../i18n';
7
 import { translate } from '../../../i18n';
8
 
8
 
9
-const logger = require('jitsi-meet-logger').getLogger(__filename);
9
+import logger from '../../logger';
10
 
10
 
11
 /**
11
 /**
12
  * The type of the React {@code Component} props of {@link DialogWithTabs}.
12
  * The type of the React {@code Component} props of {@link DialogWithTabs}.

+ 5
- 0
react/features/base/dialog/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/dialog');

+ 5
- 0
react/features/base/lastn/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/lastn');

+ 2
- 3
react/features/base/lastn/middleware.js Datei anzeigen

1
 // @flow
1
 // @flow
2
 
2
 
3
-import { getLogger } from 'jitsi-meet-logger';
4
-
5
 import { SET_FILMSTRIP_ENABLED } from '../../filmstrip/actionTypes';
3
 import { SET_FILMSTRIP_ENABLED } from '../../filmstrip/actionTypes';
6
 import { SELECT_LARGE_VIDEO_PARTICIPANT } from '../../large-video/actionTypes';
4
 import { SELECT_LARGE_VIDEO_PARTICIPANT } from '../../large-video/actionTypes';
7
 import { APP_STATE_CHANGED } from '../../mobile/background/actionTypes';
5
 import { APP_STATE_CHANGED } from '../../mobile/background/actionTypes';
12
 import { getParticipantById } from '../participants/functions';
10
 import { getParticipantById } from '../participants/functions';
13
 import { MiddlewareRegistry } from '../redux';
11
 import { MiddlewareRegistry } from '../redux';
14
 
12
 
13
+import logger from './logger';
14
+
15
 declare var APP: Object;
15
 declare var APP: Object;
16
-const logger = getLogger('features/base/lastn');
17
 
16
 
18
 
17
 
19
 MiddlewareRegistry.register(store => next => action => {
18
 MiddlewareRegistry.register(store => next => action => {

+ 1
- 2
react/features/base/lib-jitsi-meet/functions.js Datei anzeigen

4
 import { loadScript } from '../util';
4
 import { loadScript } from '../util';
5
 
5
 
6
 import JitsiMeetJS from './_';
6
 import JitsiMeetJS from './_';
7
+import logger from './logger';
7
 
8
 
8
 declare var APP: Object;
9
 declare var APP: Object;
9
 
10
 
10
 const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
11
 const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
11
 const JitsiConnectionErrors = JitsiMeetJS.errors.connection;
12
 const JitsiConnectionErrors = JitsiMeetJS.errors.connection;
12
 
13
 
13
-const logger = require('jitsi-meet-logger').getLogger(__filename);
14
-
15
 /**
14
 /**
16
  * Creates a {@link JitsiLocalTrack} model from the given device id.
15
  * Creates a {@link JitsiLocalTrack} model from the given device id.
17
  *
16
  *

+ 5
- 0
react/features/base/lib-jitsi-meet/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/lib-jitsi-meet');

+ 1
- 1
react/features/base/lib-jitsi-meet/native/RTCPeerConnection.js Datei anzeigen

3
 import { NativeModules } from 'react-native';
3
 import { NativeModules } from 'react-native';
4
 import { RTCPeerConnection, RTCSessionDescription } from 'react-native-webrtc';
4
 import { RTCPeerConnection, RTCSessionDescription } from 'react-native-webrtc';
5
 
5
 
6
-const logger = require('jitsi-meet-logger').getLogger(__filename);
6
+import logger from '../logger';
7
 
7
 
8
 /* eslint-disable no-unused-vars */
8
 /* eslint-disable no-unused-vars */
9
 
9
 

+ 22
- 0
react/features/base/logging/functions.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger as _getLogger } from 'jitsi-meet-logger';
4
+
5
+/**
6
+ * Options for building the logger. We disable the callee info on RN because it's
7
+ * almost always empty anyway.
8
+ */
9
+const DEFAULT_OPTS = {};
10
+const DEFAULT_RN_OPTS = { disableCallerInfo: true };
11
+
12
+/**
13
+ * Gets a logger for the given id.
14
+ *
15
+ * @param {string} id - Name for the logger.
16
+ * @returns {Object} - The logger object.
17
+ */
18
+export function getLogger(id: string) {
19
+    const opts = navigator.product === 'ReactNative' ? DEFAULT_RN_OPTS : DEFAULT_OPTS;
20
+
21
+    return _getLogger(id, undefined, opts);
22
+}

+ 1
- 0
react/features/base/logging/index.js Datei anzeigen

1
 export * from './actions';
1
 export * from './actions';
2
 export * from './actionTypes';
2
 export * from './actionTypes';
3
+export * from './functions';
3
 
4
 
4
 import './middleware';
5
 import './middleware';
5
 import './reducer';
6
 import './reducer';

+ 1
- 1
react/features/base/media/components/AbstractAudio.js Datei anzeigen

2
 
2
 
3
 import { Component } from 'react';
3
 import { Component } from 'react';
4
 
4
 
5
-const logger = require('jitsi-meet-logger').getLogger(__filename);
5
+import logger from '../logger';
6
 
6
 
7
 /**
7
 /**
8
  * Describes audio element interface used in the base/media feature for audio
8
  * Describes audio element interface used in the base/media feature for audio

+ 2
- 2
react/features/base/media/components/native/Audio.js Datei anzeigen

2
 
2
 
3
 import Sound from 'react-native-sound';
3
 import Sound from 'react-native-sound';
4
 
4
 
5
-import AbstractAudio from '../AbstractAudio';
5
+import logger from '../../logger';
6
 
6
 
7
-const logger = require('jitsi-meet-logger').getLogger(__filename);
7
+import AbstractAudio from '../AbstractAudio';
8
 
8
 
9
 /**
9
 /**
10
  * The React Native/mobile {@link Component} which is similar to Web's
10
  * The React Native/mobile {@link Component} which is similar to Web's

+ 5
- 0
react/features/base/media/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/media');

+ 1
- 2
react/features/base/media/middleware.js Datei anzeigen

18
 
18
 
19
 import { setAudioMuted, setCameraFacingMode, setVideoMuted } from './actions';
19
 import { setAudioMuted, setCameraFacingMode, setVideoMuted } from './actions';
20
 import { CAMERA_FACING_MODE, VIDEO_MUTISM_AUTHORITY } from './constants';
20
 import { CAMERA_FACING_MODE, VIDEO_MUTISM_AUTHORITY } from './constants';
21
+import logger from './logger';
21
 import {
22
 import {
22
     _AUDIO_INITIAL_MEDIA_STATE,
23
     _AUDIO_INITIAL_MEDIA_STATE,
23
     _VIDEO_INITIAL_MEDIA_STATE
24
     _VIDEO_INITIAL_MEDIA_STATE
24
 } from './reducer';
25
 } from './reducer';
25
 
26
 
26
-const logger = require('jitsi-meet-logger').getLogger(__filename);
27
-
28
 /**
27
 /**
29
  * Implements the entry point of the middleware of the feature base/media.
28
  * Implements the entry point of the middleware of the feature base/media.
30
  *
29
  *

+ 2
- 2
react/features/base/react/components/web/MultiSelectAutocomplete.js Datei anzeigen

5
 import _debounce from 'lodash/debounce';
5
 import _debounce from 'lodash/debounce';
6
 import React, { Component } from 'react';
6
 import React, { Component } from 'react';
7
 
7
 
8
-import InlineDialogFailure from './InlineDialogFailure';
8
+import logger from '../../logger';
9
 
9
 
10
-const logger = require('jitsi-meet-logger').getLogger(__filename);
10
+import InlineDialogFailure from './InlineDialogFailure';
11
 
11
 
12
 /**
12
 /**
13
  * The type of the React {@code Component} props of
13
  * The type of the React {@code Component} props of

+ 5
- 0
react/features/base/react/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/react');

+ 1
- 1
react/features/base/redux/StateListenerRegistry.js Datei anzeigen

2
 
2
 
3
 import type { Store } from 'redux';
3
 import type { Store } from 'redux';
4
 
4
 
5
-const logger = require('jitsi-meet-logger').getLogger(__filename);
5
+import logger from './logger';
6
 
6
 
7
 /**
7
 /**
8
  * The type listener supported for registration with
8
  * The type listener supported for registration with

+ 5
- 0
react/features/base/redux/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/redux');

+ 5
- 0
react/features/base/settings/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/settings');

+ 1
- 2
react/features/base/settings/reducer.js Datei anzeigen

10
 import { assignIfDefined } from '../util';
10
 import { assignIfDefined } from '../util';
11
 
11
 
12
 import { SETTINGS_UPDATED } from './actionTypes';
12
 import { SETTINGS_UPDATED } from './actionTypes';
13
-
14
-const logger = require('jitsi-meet-logger').getLogger(__filename);
13
+import logger from './logger';
15
 
14
 
16
 /**
15
 /**
17
  * The default/initial redux state of the feature {@code base/settings}.
16
  * The default/initial redux state of the feature {@code base/settings}.

+ 5
- 0
react/features/base/sounds/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/sounds');

+ 1
- 2
react/features/base/sounds/middleware.js Datei anzeigen

3
 import { MiddlewareRegistry } from '../redux';
3
 import { MiddlewareRegistry } from '../redux';
4
 
4
 
5
 import { PLAY_SOUND, STOP_SOUND } from './actionTypes';
5
 import { PLAY_SOUND, STOP_SOUND } from './actionTypes';
6
-
7
-const logger = require('jitsi-meet-logger').getLogger(__filename);
6
+import logger from './logger';
8
 
7
 
9
 /**
8
 /**
10
  * Implements the entry point of the middleware of the feature base/media.
9
  * Implements the entry point of the middleware of the feature base/media.

+ 1
- 2
react/features/base/sounds/reducer.js Datei anzeigen

9
     REGISTER_SOUND,
9
     REGISTER_SOUND,
10
     UNREGISTER_SOUND
10
     UNREGISTER_SOUND
11
 } from './actionTypes';
11
 } from './actionTypes';
12
-
13
-const logger = require('jitsi-meet-logger').getLogger(__filename);
12
+import logger from './logger';
14
 
13
 
15
 /**
14
 /**
16
  * The structure use by this reducer to describe a sound.
15
  * The structure use by this reducer to describe a sound.

+ 1
- 1
react/features/base/storage/PersistenceRegistry.js Datei anzeigen

2
 
2
 
3
 import md5 from 'js-md5';
3
 import md5 from 'js-md5';
4
 
4
 
5
-const logger = require('jitsi-meet-logger').getLogger(__filename);
5
+import logger from './logger';
6
 
6
 
7
 /**
7
 /**
8
  * The name of the {@code localStorage} store where the app persists its values.
8
  * The name of the {@code localStorage} store where the app persists its values.

+ 5
- 0
react/features/base/storage/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/storage');

+ 5
- 0
react/features/base/testing/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/testing');

+ 2
- 5
react/features/base/testing/middleware.js Datei anzeigen

1
-/* @flow */
2
-
3
-import Logger from 'jitsi-meet-logger';
4
-
5
-const logger = Logger.getLogger(__filename);
1
+// @flow
6
 
2
 
7
 import { MiddlewareRegistry } from '../redux';
3
 import { MiddlewareRegistry } from '../redux';
8
 
4
 
9
 import { CONFERENCE_WILL_JOIN } from '../conference';
5
 import { CONFERENCE_WILL_JOIN } from '../conference';
10
 import { JitsiConferenceEvents } from '../lib-jitsi-meet';
6
 import { JitsiConferenceEvents } from '../lib-jitsi-meet';
11
 import { setConnectionState } from './actions';
7
 import { setConnectionState } from './actions';
8
+import logger from './logger';
12
 
9
 
13
 /**
10
 /**
14
  * The Redux middleware of the feature testing.
11
  * The Redux middleware of the feature testing.

+ 1
- 2
react/features/base/tracks/actions.js Datei anzeigen

24
     TRACK_WILL_CREATE
24
     TRACK_WILL_CREATE
25
 } from './actionTypes';
25
 } from './actionTypes';
26
 import { createLocalTracksF, getLocalTrack, getLocalTracks, getTrackByJitsiTrack } from './functions';
26
 import { createLocalTracksF, getLocalTrack, getLocalTracks, getTrackByJitsiTrack } from './functions';
27
-
28
-const logger = require('jitsi-meet-logger').getLogger(__filename);
27
+import logger from './logger';
29
 
28
 
30
 /**
29
 /**
31
  * Requests the creating of the desired media type tracks. Desire is expressed
30
  * Requests the creating of the desired media type tracks. Desire is expressed

+ 1
- 1
react/features/base/tracks/functions.js Datei anzeigen

8
     getUserSelectedMicDeviceId
8
     getUserSelectedMicDeviceId
9
 } from '../settings';
9
 } from '../settings';
10
 
10
 
11
-const logger = require('jitsi-meet-logger').getLogger(__filename);
11
+import logger from './logger';
12
 
12
 
13
 /**
13
 /**
14
  * Create local tracks of specific types.
14
  * Create local tracks of specific types.

+ 5
- 0
react/features/base/tracks/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/tracks');

+ 1
- 1
react/features/base/util/helpers.js Datei anzeigen

1
 // @flow
1
 // @flow
2
 
2
 
3
-const logger = require('jitsi-meet-logger').getLogger(__filename);
3
+import logger from './logger';
4
 
4
 
5
 /**
5
 /**
6
  * Creates a deferred object.
6
  * Creates a deferred object.

+ 1
- 1
react/features/base/util/httpUtils.js Datei anzeigen

1
 import { timeoutPromise } from './timeoutPromise';
1
 import { timeoutPromise } from './timeoutPromise';
2
 
2
 
3
-const logger = require('jitsi-meet-logger').getLogger(__filename);
3
+import logger from './logger';
4
 
4
 
5
 /**
5
 /**
6
  * The number of milliseconds before deciding that we need retry a fetch request.
6
  * The number of milliseconds before deciding that we need retry a fetch request.

+ 5
- 0
react/features/base/util/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../logging/functions';
4
+
5
+export default getLogger('features/base/util');

+ 1
- 1
react/features/base/util/uri.js Datei anzeigen

1
 // @flow
1
 // @flow
2
 
2
 
3
-const logger = require('jitsi-meet-logger').getLogger(__filename);
3
+import logger from './logger';
4
 
4
 
5
 /**
5
 /**
6
  * The app linking scheme.
6
  * The app linking scheme.

+ 1
- 2
react/features/blur/actions.js Datei anzeigen

4
 
4
 
5
 import { BLUR_DISABLED, BLUR_ENABLED } from './actionTypes';
5
 import { BLUR_DISABLED, BLUR_ENABLED } from './actionTypes';
6
 import { getBlurEffect } from './functions';
6
 import { getBlurEffect } from './functions';
7
-
8
-const logger = require('jitsi-meet-logger').getLogger(__filename);
7
+import logger from './logger';
9
 
8
 
10
 /**
9
 /**
11
 * Signals the local participant is switching between blurred or non blurred video.
10
 * Signals the local participant is switching between blurred or non blurred video.

+ 5
- 0
react/features/blur/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/blur');

+ 1
- 2
react/features/calendar-sync/actions.web.js Datei anzeigen

17
     SET_LOADING_CALENDAR_EVENTS
17
     SET_LOADING_CALENDAR_EVENTS
18
 } from './actionTypes';
18
 } from './actionTypes';
19
 import { _getCalendarIntegration, isCalendarEnabled } from './functions';
19
 import { _getCalendarIntegration, isCalendarEnabled } from './functions';
20
+import logger from './logger';
20
 
21
 
21
 export * from './actions.any';
22
 export * from './actions.any';
22
 
23
 
23
-const logger = require('jitsi-meet-logger').getLogger(__filename);
24
-
25
 /**
24
 /**
26
  * Sets the initial state of calendar integration by loading third party APIs
25
  * Sets the initial state of calendar integration by loading third party APIs
27
  * and filling out any data that needs to be fetched.
26
  * and filling out any data that needs to be fetched.

+ 1
- 2
react/features/calendar-sync/functions.native.js Datei anzeigen

10
 import { setCalendarAuthorization } from './actions';
10
 import { setCalendarAuthorization } from './actions';
11
 import { FETCH_END_DAYS, FETCH_START_DAYS } from './constants';
11
 import { FETCH_END_DAYS, FETCH_START_DAYS } from './constants';
12
 import { _updateCalendarEntries } from './functions';
12
 import { _updateCalendarEntries } from './functions';
13
+import logger from './logger';
13
 
14
 
14
 export * from './functions.any';
15
 export * from './functions.any';
15
 
16
 
16
-const logger = require('jitsi-meet-logger').getLogger(__filename);
17
-
18
 /**
17
 /**
19
  * Adds a Jitsi link to a calendar entry.
18
  * Adds a Jitsi link to a calendar entry.
20
  *
19
  *

+ 1
- 1
react/features/calendar-sync/functions.web.js Datei anzeigen

18
 import { microsoftCalendarApi } from './web/microsoftCalendar';
18
 import { microsoftCalendarApi } from './web/microsoftCalendar';
19
 import { toState } from '../base/redux';
19
 import { toState } from '../base/redux';
20
 
20
 
21
-const logger = require('jitsi-meet-logger').getLogger(__filename);
21
+import logger from './logger';
22
 
22
 
23
 /**
23
 /**
24
  * Determines whether the calendar feature is enabled by the web.
24
  * Determines whether the calendar feature is enabled by the web.

+ 5
- 0
react/features/calendar-sync/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/calendar-sync');

+ 1
- 3
react/features/conference/components/web/Conference.js Datei anzeigen

23
 } from '../../../toolbox';
23
 } from '../../../toolbox';
24
 
24
 
25
 import { maybeShowSuboptimalExperienceNotification } from '../../functions';
25
 import { maybeShowSuboptimalExperienceNotification } from '../../functions';
26
+import logger from '../../logger';
26
 
27
 
27
 import Labels from './Labels';
28
 import Labels from './Labels';
28
 import { default as Notice } from './Notice';
29
 import { default as Notice } from './Notice';
31
     AbstractConference,
32
     AbstractConference,
32
     abstractMapStateToProps
33
     abstractMapStateToProps
33
 } from '../AbstractConference';
34
 } from '../AbstractConference';
34
-
35
 import type { AbstractProps } from '../AbstractConference';
35
 import type { AbstractProps } from '../AbstractConference';
36
 
36
 
37
 declare var APP: Object;
37
 declare var APP: Object;
38
 declare var config: Object;
38
 declare var config: Object;
39
 declare var interfaceConfig: Object;
39
 declare var interfaceConfig: Object;
40
 
40
 
41
-const logger = require('jitsi-meet-logger').getLogger(__filename);
42
-
43
 /**
41
 /**
44
  * DOM events for when full screen mode has changed. Different browsers need
42
  * DOM events for when full screen mode has changed. Different browsers need
45
  * different vendor prefixes.
43
  * different vendor prefixes.

+ 5
- 0
react/features/conference/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/conference');

+ 1
- 1
react/features/desktop-picker/functions.js Datei anzeigen

1
 
1
 
2
-const logger = require('jitsi-meet-logger').getLogger(__filename);
2
+import logger from './logger';
3
 
3
 
4
 /**
4
 /**
5
  * Begins a request to get available DesktopCapturerSources.
5
  * Begins a request to get available DesktopCapturerSources.

+ 5
- 0
react/features/desktop-picker/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/desktop-picker');

+ 1
- 2
react/features/device-selection/actions.js Datei anzeigen

16
 
16
 
17
 import { SET_DEVICE_SELECTION_POPUP_DATA } from './actionTypes';
17
 import { SET_DEVICE_SELECTION_POPUP_DATA } from './actionTypes';
18
 import { getDeviceSelectionDialogProps, processExternalDeviceRequest } from './functions';
18
 import { getDeviceSelectionDialogProps, processExternalDeviceRequest } from './functions';
19
-
20
-const logger = require('jitsi-meet-logger').getLogger(__filename);
19
+import logger from './logger';
21
 
20
 
22
 /**
21
 /**
23
  * Opens a popup window with the device selection dialog in it.
22
  * Opens a popup window with the device selection dialog in it.

+ 2
- 2
react/features/device-selection/components/DeviceSelection.js Datei anzeigen

7
 import { translate } from '../../base/i18n';
7
 import { translate } from '../../base/i18n';
8
 import JitsiMeetJS, { createLocalTrack } from '../../base/lib-jitsi-meet';
8
 import JitsiMeetJS, { createLocalTrack } from '../../base/lib-jitsi-meet';
9
 
9
 
10
+import logger from '../logger';
11
+
10
 import AudioInputPreview from './AudioInputPreview';
12
 import AudioInputPreview from './AudioInputPreview';
11
 import AudioOutputPreview from './AudioOutputPreview';
13
 import AudioOutputPreview from './AudioOutputPreview';
12
 import DeviceSelector from './DeviceSelector';
14
 import DeviceSelector from './DeviceSelector';
13
 import VideoInputPreview from './VideoInputPreview';
15
 import VideoInputPreview from './VideoInputPreview';
14
 
16
 
15
-const logger = require('jitsi-meet-logger').getLogger(__filename);
16
-
17
 /**
17
 /**
18
  * The type of the React {@code Component} props of {@link DeviceSelection}.
18
  * The type of the React {@code Component} props of {@link DeviceSelection}.
19
  */
19
  */

+ 5
- 0
react/features/device-selection/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/device-selection');

+ 1
- 2
react/features/dropbox/functions.any.js Datei anzeigen

2
 export * from './functions';
2
 export * from './functions';
3
 
3
 
4
 import { getDisplayName, getSpaceUsage } from './functions';
4
 import { getDisplayName, getSpaceUsage } from './functions';
5
-
6
-const logger = require('jitsi-meet-logger').getLogger(__filename);
5
+import logger from './logger';
7
 
6
 
8
 /**
7
 /**
9
  * Information related to the user's dropbox account.
8
  * Information related to the user's dropbox account.

+ 5
- 0
react/features/dropbox/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/dropbox');

+ 5
- 0
react/features/follow-me/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/follow-me');

+ 1
- 2
react/features/follow-me/middleware.js Datei anzeigen

16
 import { setTileView } from '../video-layout';
16
 import { setTileView } from '../video-layout';
17
 
17
 
18
 import { FOLLOW_ME_COMMAND } from './constants';
18
 import { FOLLOW_ME_COMMAND } from './constants';
19
-
20
-const logger = require('jitsi-meet-logger').getLogger(__filename);
19
+import logger from './logger';
21
 
20
 
22
 declare var APP: Object;
21
 declare var APP: Object;
23
 
22
 

+ 1
- 2
react/features/invite/actions.js Datei anzeigen

21
     getDialInNumbers,
21
     getDialInNumbers,
22
     invitePeopleAndChatRooms
22
     invitePeopleAndChatRooms
23
 } from './functions';
23
 } from './functions';
24
-
25
-const logger = require('jitsi-meet-logger').getLogger(__filename);
24
+import logger from './logger';
26
 
25
 
27
 /**
26
 /**
28
  * Creates a (redux) action to signal that a click/tap has been performed on
27
  * Creates a (redux) action to signal that a click/tap has been performed on

+ 1
- 1
react/features/invite/components/add-people-dialog/AbstractAddPeopleDialog.js Datei anzeigen

16
     showNotification
16
     showNotification
17
 } from '../../../notifications';
17
 } from '../../../notifications';
18
 
18
 
19
-const logger = require('jitsi-meet-logger').getLogger(__filename);
19
+import logger from '../../logger';
20
 
20
 
21
 export type Props = {
21
 export type Props = {
22
 
22
 

+ 1
- 2
react/features/invite/components/info-dialog/web/InfoDialog.js Datei anzeigen

18
     _getDefaultPhoneNumber,
18
     _getDefaultPhoneNumber,
19
     getDialInfoPageURL
19
     getDialInfoPageURL
20
 } from '../../../functions';
20
 } from '../../../functions';
21
+import logger from '../../../logger';
21
 import DialInNumber from './DialInNumber';
22
 import DialInNumber from './DialInNumber';
22
 import PasswordForm from './PasswordForm';
23
 import PasswordForm from './PasswordForm';
23
 
24
 
24
-const logger = require('jitsi-meet-logger').getLogger(__filename);
25
-
26
 /**
25
 /**
27
  * The type of the React {@code Component} props of {@link InfoDialog}.
26
  * The type of the React {@code Component} props of {@link InfoDialog}.
28
  */
27
  */

+ 2
- 2
react/features/invite/functions.js Datei anzeigen

4
 import { isLocalParticipantModerator } from '../base/participants';
4
 import { isLocalParticipantModerator } from '../base/participants';
5
 import { doGetJSON, parseURIString } from '../base/util';
5
 import { doGetJSON, parseURIString } from '../base/util';
6
 
6
 
7
+import logger from './logger';
8
+
7
 declare var $: Function;
9
 declare var $: Function;
8
 declare var interfaceConfig: Object;
10
 declare var interfaceConfig: Object;
9
 
11
 
10
-const logger = require('jitsi-meet-logger').getLogger(__filename);
11
-
12
 /**
12
 /**
13
  * Sends an ajax request to check if the phone number can be called.
13
  * Sends an ajax request to check if the phone number can be called.
14
  *
14
  *

+ 5
- 0
react/features/invite/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/invite');

+ 1
- 2
react/features/invite/middleware.any.js Datei anzeigen

45
     OUTGOING_CALL_RINGING_SOUND_ID,
45
     OUTGOING_CALL_RINGING_SOUND_ID,
46
     OUTGOING_CALL_START_SOUND_ID
46
     OUTGOING_CALL_START_SOUND_ID
47
 } from './constants';
47
 } from './constants';
48
+import logger from './logger';
48
 import { sounds } from './sounds';
49
 import { sounds } from './sounds';
49
 
50
 
50
-const logger = require('jitsi-meet-logger').getLogger(__filename);
51
-
52
 declare var interfaceConfig: Object;
51
 declare var interfaceConfig: Object;
53
 
52
 
54
 /**
53
 /**

+ 1
- 2
react/features/invite/reducer.js Datei anzeigen

11
     UPDATE_DIAL_IN_NUMBERS_FAILED,
11
     UPDATE_DIAL_IN_NUMBERS_FAILED,
12
     UPDATE_DIAL_IN_NUMBERS_SUCCESS
12
     UPDATE_DIAL_IN_NUMBERS_SUCCESS
13
 } from './actionTypes';
13
 } from './actionTypes';
14
-
15
-const logger = require('jitsi-meet-logger').getLogger(__filename);
14
+import logger from './logger';
16
 
15
 
17
 const DEFAULT_STATE = {
16
 const DEFAULT_STATE = {
18
     /**
17
     /**

+ 1
- 2
react/features/local-recording/controller/RecordingController.js Datei anzeigen

2
 
2
 
3
 import { i18next } from '../../base/i18n';
3
 import { i18next } from '../../base/i18n';
4
 
4
 
5
+import logger from '../logger';
5
 import {
6
 import {
6
     FlacAdapter,
7
     FlacAdapter,
7
     OggAdapter,
8
     OggAdapter,
10
 } from '../recording';
11
 } from '../recording';
11
 import { sessionManager } from '../session';
12
 import { sessionManager } from '../session';
12
 
13
 
13
-const logger = require('jitsi-meet-logger').getLogger(__filename);
14
-
15
 /**
14
 /**
16
  * XMPP command for signaling the start of local recording to all clients.
15
  * XMPP command for signaling the start of local recording to all clients.
17
  * Should be sent by the moderator only.
16
  * Should be sent by the moderator only.

+ 5
- 0
react/features/local-recording/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/local-recording');

+ 1
- 2
react/features/local-recording/recording/AbstractAudioContextAdapter.js Datei anzeigen

1
+import logger from '../logger';
1
 import { RecordingAdapter } from './RecordingAdapter';
2
 import { RecordingAdapter } from './RecordingAdapter';
2
 
3
 
3
-const logger = require('jitsi-meet-logger').getLogger(__filename);
4
-
5
 /**
4
 /**
6
  * Base class for {@code AudioContext}-based recording adapters.
5
  * Base class for {@code AudioContext}-based recording adapters.
7
  */
6
  */

+ 1
- 2
react/features/local-recording/recording/OggAdapter.js Datei anzeigen

1
+import logger from '../logger';
1
 import { RecordingAdapter } from './RecordingAdapter';
2
 import { RecordingAdapter } from './RecordingAdapter';
2
 
3
 
3
-const logger = require('jitsi-meet-logger').getLogger(__filename);
4
-
5
 /**
4
 /**
6
  * Recording adapter that uses {@code MediaRecorder} (default browser encoding
5
  * Recording adapter that uses {@code MediaRecorder} (default browser encoding
7
  * with Opus codec).
6
  * with Opus codec).

+ 1
- 2
react/features/local-recording/recording/WavAdapter.js Datei anzeigen

1
+import logger from '../logger';
1
 import { AbstractAudioContextAdapter } from './AbstractAudioContextAdapter';
2
 import { AbstractAudioContextAdapter } from './AbstractAudioContextAdapter';
2
 
3
 
3
-const logger = require('jitsi-meet-logger').getLogger(__filename);
4
-
5
 const WAV_BITS_PER_SAMPLE = 16;
4
 const WAV_BITS_PER_SAMPLE = 16;
6
 
5
 
7
 /**
6
 /**

+ 1
- 2
react/features/local-recording/recording/flac/FlacAdapter.js Datei anzeigen

1
+import logger from '../../logger';
1
 import {
2
 import {
2
     DEBUG,
3
     DEBUG,
3
     MAIN_THREAD_FINISH,
4
     MAIN_THREAD_FINISH,
9
 
10
 
10
 import { AbstractAudioContextAdapter } from '../AbstractAudioContextAdapter';
11
 import { AbstractAudioContextAdapter } from '../AbstractAudioContextAdapter';
11
 
12
 
12
-const logger = require('jitsi-meet-logger').getLogger(__filename);
13
-
14
 /**
13
 /**
15
  * Recording adapter that uses libflac.js in the background.
14
  * Recording adapter that uses libflac.js in the background.
16
  */
15
  */

+ 1
- 2
react/features/local-recording/recording/flac/flacEncodeWorker.js Datei anzeigen

1
+import logger from '../../logger';
1
 import {
2
 import {
2
     MAIN_THREAD_FINISH,
3
     MAIN_THREAD_FINISH,
3
     MAIN_THREAD_INIT,
4
     MAIN_THREAD_INIT,
6
     WORKER_LIBFLAC_READY
7
     WORKER_LIBFLAC_READY
7
 } from './messageTypes';
8
 } from './messageTypes';
8
 
9
 
9
-const logger = require('jitsi-meet-logger').getLogger(__filename);
10
-
11
 /**
10
 /**
12
  * WebWorker that does FLAC encoding using libflac.js
11
  * WebWorker that does FLAC encoding using libflac.js
13
  */
12
  */

+ 1
- 1
react/features/local-recording/session/SessionManager.js Datei anzeigen

2
 
2
 
3
 import jitsiLocalStorage from '../../../../modules/util/JitsiLocalStorage';
3
 import jitsiLocalStorage from '../../../../modules/util/JitsiLocalStorage';
4
 
4
 
5
-const logger = require('jitsi-meet-logger').getLogger(__filename);
5
+import logger from '../logger';
6
 
6
 
7
 /**
7
 /**
8
  * Gets high precision system time.
8
  * Gets high precision system time.

+ 5
- 0
react/features/mobile/audio-mode/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../../base/logging/functions';
4
+
5
+export default getLogger('features/mobile/audio-mode');

+ 1
- 1
react/features/mobile/audio-mode/middleware.js Datei anzeigen

13
 import { MiddlewareRegistry } from '../../base/redux';
13
 import { MiddlewareRegistry } from '../../base/redux';
14
 
14
 
15
 import { _SET_AUDIOMODE_DEVICES, _SET_AUDIOMODE_SUBSCRIPTIONS } from './actionTypes';
15
 import { _SET_AUDIOMODE_DEVICES, _SET_AUDIOMODE_SUBSCRIPTIONS } from './actionTypes';
16
+import logger from './logger';
16
 
17
 
17
 const { AudioMode } = NativeModules;
18
 const { AudioMode } = NativeModules;
18
 const AudioModeEmitter = new NativeEventEmitter(AudioMode);
19
 const AudioModeEmitter = new NativeEventEmitter(AudioMode);
19
-const logger = require('jitsi-meet-logger').getLogger(__filename);
20
 
20
 
21
 /**
21
 /**
22
  * Middleware that captures conference actions and sets the correct audio mode
22
  * Middleware that captures conference actions and sets the correct audio mode

+ 1
- 2
react/features/mobile/picture-in-picture/actions.js Datei anzeigen

7
 import { Platform } from '../../base/react';
7
 import { Platform } from '../../base/react';
8
 
8
 
9
 import { ENTER_PICTURE_IN_PICTURE } from './actionTypes';
9
 import { ENTER_PICTURE_IN_PICTURE } from './actionTypes';
10
-
11
-const logger = require('jitsi-meet-logger').getLogger(__filename);
10
+import logger from './logger';
12
 
11
 
13
 /**
12
 /**
14
  * Enters (or rather initiates entering) picture-in-picture.
13
  * Enters (or rather initiates entering) picture-in-picture.

+ 5
- 0
react/features/mobile/picture-in-picture/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../../base/logging/functions';
4
+
5
+export default getLogger('features/mobile/pip');

+ 5
- 0
react/features/mobile/watchos/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../../base/logging/functions';
4
+
5
+export default getLogger('features/mobile/watchos');

+ 1
- 2
react/features/mobile/watchos/middleware.js Datei anzeigen

17
 
17
 
18
 import { setConferenceTimestamp, setSessionId, setWatchReachable } from './actions';
18
 import { setConferenceTimestamp, setSessionId, setWatchReachable } from './actions';
19
 import { CMD_HANG_UP, CMD_JOIN_CONFERENCE, CMD_SET_MUTED, MAX_RECENT_URLS } from './constants';
19
 import { CMD_HANG_UP, CMD_JOIN_CONFERENCE, CMD_SET_MUTED, MAX_RECENT_URLS } from './constants';
20
-
21
-const logger = require('jitsi-meet-logger').getLogger(__filename);
20
+import logger from './logger';
22
 
21
 
23
 const watchOSEnabled = Platform.OS === 'ios';
22
 const watchOSEnabled = Platform.OS === 'ios';
24
 
23
 

+ 1
- 2
react/features/overlay/components/AbstractPageReloadOverlay.js Datei anzeigen

14
     isFatalJitsiConnectionError
14
     isFatalJitsiConnectionError
15
 } from '../../base/lib-jitsi-meet';
15
 } from '../../base/lib-jitsi-meet';
16
 
16
 
17
+import logger from '../logger';
17
 import ReloadButton from './web/ReloadButton';
18
 import ReloadButton from './web/ReloadButton';
18
 
19
 
19
 declare var APP: Object;
20
 declare var APP: Object;
20
 
21
 
21
-const logger = require('jitsi-meet-logger').getLogger(__filename);
22
-
23
 /**
22
 /**
24
  * The type of the React {@code Component} props of
23
  * The type of the React {@code Component} props of
25
  * {@link AbstractPageReloadOverlay}.
24
  * {@link AbstractPageReloadOverlay}.

+ 5
- 0
react/features/overlay/logger.js Datei anzeigen

1
+// @flow
2
+
3
+import { getLogger } from '../base/logging/functions';
4
+
5
+export default getLogger('features/overlay');

+ 0
- 0
react/features/recent-list/logger.js Datei anzeigen


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.

Laden…
Abbrechen
Speichern