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.

react/features/always-on-top/AudioMuteButton.js

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

react/features/always-on-top/VideoMuteButton.js

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

react/features/always-on-top/logger.js

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

react/features/analytics/functions.js

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

react/features/analytics/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../base/logging/functions';
+
+export default getLogger('features/analytics');

react/features/app/actions.js

@@ -25,8 +25,7 @@ import {
     getDefaultURL,
     getName
 } from './functions';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 declare var APP: Object;
 

react/features/app/components/App.native.js

@@ -27,13 +27,12 @@ import '../../mobile/proximity';
 import '../../mobile/wake-lock';
 import '../../mobile/watchos';
 
+import logger from '../logger';
 import { AbstractApp } from './AbstractApp';
 import type { Props as AbstractAppProps } from './AbstractApp';
 
 declare var __DEV__;
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 /**
  * The type of React {@code Component} props of {@link App}.
  */

react/features/app/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../base/logging/functions';
+
+export default getLogger('features/app');

react/features/authentication/actions.js

@@ -16,8 +16,7 @@ import {
     WAIT_FOR_OWNER
 } from './actionTypes';
 import { LoginDialog, WaitForOwnerDialog } from './components';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
  * Initiates authenticating and upgrading the role of the local participant to

react/features/authentication/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../base/logging/functions';
+
+export default getLogger('features/authentication');

react/features/base/app/components/BaseApp.js

@@ -17,8 +17,7 @@ import { SoundCollection } from '../../sounds';
 import { PersistenceRegistry } from '../../storage';
 
 import { appWillMount, appWillUnmount } from '../actions';
-
+import logger from '../logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 declare var APP: Object;
 

react/features/base/app/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/app');

react/features/base/audio-only/actions.js

@@ -1,18 +1,15 @@
 // @flow
 
-import { getLogger } from 'jitsi-meet-logger';
-
 import UIEvents from '../../../../service/UI/UIEvents';
 
 import { createAudioOnlyChangedEvent, sendAnalytics } from '../../analytics';
 
 import { SET_AUDIO_ONLY } from './actionTypes';
+import logger from './logger';
 
 import type { Dispatch } from 'redux';
 
 declare var APP: Object;
-const logger = getLogger('features/base/audio-only');
-
 
 /**
  * Sets the audio-only flag for the current JitsiConference.

react/features/base/audio-only/logger.js

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

react/features/base/conference/actions.js

@@ -1,5 +1,7 @@
 // @flow
 
+import type { Dispatch } from 'redux';
+
 import {
     createStartMutedConfigurationEvent,
     sendAnalytics
@@ -58,9 +60,7 @@ import {
     getCurrentConference,
     sendLocalParticipant
 } from './functions';
-import type { Dispatch } from 'redux';
+import logger from './logger';
-
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 declare var APP: Object;
 

react/features/base/conference/functions.js

@@ -19,8 +19,7 @@ import {
     JITSI_CONFERENCE_URL_KEY,
     VIDEO_QUALITY_LEVELS
 } from './constants';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
  * Attach a set of local tracks to a conference.

react/features/base/conference/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/conference');

react/features/base/conference/middleware.js

@@ -41,8 +41,7 @@ import {
     forEachConference,
     getCurrentConference
 } from './functions';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 declare var APP: Object;
 

react/features/base/config/functions.any.js

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

react/features/base/config/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/config');

react/features/base/connection/actions.native.js

@@ -19,8 +19,7 @@ import {
     SET_LOCATION_URL
 } from './actionTypes';
 import { JITSI_CONNECTION_URL_KEY } from './constants';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
  * The error structure passed to the {@link connectionFailed} action.

react/features/base/connection/actions.web.js

@@ -5,8 +5,6 @@ import type { Dispatch } from 'redux';
 declare var APP: Object;
 declare var config: Object;
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 import { configureInitialDevices } from '../devices';
 
 export {
@@ -14,6 +12,7 @@ export {
     connectionFailed,
     setLocationURL
 } from './actions.native';
+import logger from './logger';
 
 /**
  * Opens new connection.

react/features/base/connection/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/connection');

react/features/base/devices/actions.js

@@ -20,8 +20,7 @@ import {
     getDevicesFromURL,
     setAudioOutputDeviceId
 } from './functions';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
  * Maps the WebRTC string for device type to the keys used to store configure,

react/features/base/devices/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/devices');

react/features/base/devices/middleware.js

@@ -21,8 +21,7 @@ import {
 import { showNotification, showWarningNotification } from '../../notifications';
 import { updateSettings } from '../settings';
 import { setAudioOutputDeviceId } from './functions';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 const JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP = {
     microphone: {

react/features/base/dialog/components/web/DialogWithTabs.js

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

react/features/base/dialog/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/dialog');

react/features/base/lastn/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/lastn');

react/features/base/lastn/middleware.js

@@ -1,7 +1,5 @@
 // @flow
 
-import { getLogger } from 'jitsi-meet-logger';
-
 import { SET_FILMSTRIP_ENABLED } from '../../filmstrip/actionTypes';
 import { SELECT_LARGE_VIDEO_PARTICIPANT } from '../../large-video/actionTypes';
 import { APP_STATE_CHANGED } from '../../mobile/background/actionTypes';
@@ -12,8 +10,9 @@ import { CONFERENCE_JOINED } from '../conference/actionTypes';
 import { getParticipantById } from '../participants/functions';
 import { MiddlewareRegistry } from '../redux';
 
+import logger from './logger';
+
 declare var APP: Object;
-const logger = getLogger('features/base/lastn');
 
 
 MiddlewareRegistry.register(store => next => action => {

react/features/base/lib-jitsi-meet/functions.js

@@ -4,14 +4,13 @@ import { toState } from '../redux';
 import { loadScript } from '../util';
 
 import JitsiMeetJS from './_';
+import logger from './logger';
 
 declare var APP: Object;
 
 const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
 const JitsiConnectionErrors = JitsiMeetJS.errors.connection;
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 /**
  * Creates a {@link JitsiLocalTrack} model from the given device id.
  *

react/features/base/lib-jitsi-meet/logger.js

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

react/features/base/lib-jitsi-meet/native/RTCPeerConnection.js

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

react/features/base/logging/functions.js

@@ -0,0 +1,22 @@
+// @flow
+
+import { getLogger as _getLogger } from 'jitsi-meet-logger';
+
+/**
+ * Options for building the logger. We disable the callee info on RN because it's
+ * almost always empty anyway.
+ */
+const DEFAULT_OPTS = {};
+const DEFAULT_RN_OPTS = { disableCallerInfo: true };
+
+/**
+ * Gets a logger for the given id.
+ *
+ * @param {string} id - Name for the logger.
+ * @returns {Object} - The logger object.
+ */
+export function getLogger(id: string) {
+    const opts = navigator.product === 'ReactNative' ? DEFAULT_RN_OPTS : DEFAULT_OPTS;
+
+    return _getLogger(id, undefined, opts);
+}

react/features/base/logging/index.js

@@ -1,5 +1,6 @@
 export * from './actions';
 export * from './actionTypes';
+export * from './functions';
 
 import './middleware';
 import './reducer';

react/features/base/media/components/AbstractAudio.js

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

react/features/base/media/components/native/Audio.js

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

react/features/base/media/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/media');

react/features/base/media/middleware.js

@@ -18,13 +18,12 @@ import { setTrackMuted, TRACK_ADDED } from '../tracks';
 
 import { setAudioMuted, setCameraFacingMode, setVideoMuted } from './actions';
 import { CAMERA_FACING_MODE, VIDEO_MUTISM_AUTHORITY } from './constants';
+import logger from './logger';
 import {
     _AUDIO_INITIAL_MEDIA_STATE,
     _VIDEO_INITIAL_MEDIA_STATE
 } from './reducer';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 /**
  * Implements the entry point of the middleware of the feature base/media.
  *

react/features/base/react/components/web/MultiSelectAutocomplete.js

@@ -5,9 +5,9 @@ import AKInlineDialog from '@atlaskit/inline-dialog';
 import _debounce from 'lodash/debounce';
 import React, { Component } from 'react';
 
-import InlineDialogFailure from './InlineDialogFailure';
+import logger from '../../logger';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
+import InlineDialogFailure from './InlineDialogFailure';
 
 /**
  * The type of the React {@code Component} props of

react/features/base/react/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/react');

react/features/base/redux/StateListenerRegistry.js

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

react/features/base/redux/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/redux');

react/features/base/settings/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/settings');

react/features/base/settings/reducer.js

@@ -10,8 +10,7 @@ import { PersistenceRegistry } from '../storage';
 import { assignIfDefined } from '../util';
 
 import { SETTINGS_UPDATED } from './actionTypes';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
  * The default/initial redux state of the feature {@code base/settings}.

react/features/base/sounds/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/sounds');

react/features/base/sounds/middleware.js

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

react/features/base/sounds/reducer.js

@@ -9,8 +9,7 @@ import {
     REGISTER_SOUND,
     UNREGISTER_SOUND
 } from './actionTypes';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
  * The structure use by this reducer to describe a sound.

react/features/base/storage/PersistenceRegistry.js

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

react/features/base/storage/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/storage');

react/features/base/testing/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/testing');

react/features/base/testing/middleware.js

@@ -1,14 +1,11 @@
-/* @flow */
+// @flow
-
-import Logger from 'jitsi-meet-logger';
-
-const logger = Logger.getLogger(__filename);
 
 import { MiddlewareRegistry } from '../redux';
 
 import { CONFERENCE_WILL_JOIN } from '../conference';
 import { JitsiConferenceEvents } from '../lib-jitsi-meet';
 import { setConnectionState } from './actions';
+import logger from './logger';
 
 /**
  * The Redux middleware of the feature testing.

react/features/base/tracks/actions.js

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

react/features/base/tracks/functions.js

@@ -8,7 +8,7 @@ import {
     getUserSelectedMicDeviceId
 } from '../settings';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
+import logger from './logger';
 
 /**
  * Create local tracks of specific types.

react/features/base/tracks/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/tracks');

react/features/base/util/helpers.js

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

react/features/base/util/httpUtils.js

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

react/features/base/util/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/util');

react/features/base/util/uri.js

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

react/features/blur/actions.js

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

react/features/blur/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../base/logging/functions';
+
+export default getLogger('features/blur');

react/features/calendar-sync/actions.web.js

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

react/features/calendar-sync/functions.native.js

@@ -10,11 +10,10 @@ import { getShareInfoText } from '../invite';
 import { setCalendarAuthorization } from './actions';
 import { FETCH_END_DAYS, FETCH_START_DAYS } from './constants';
 import { _updateCalendarEntries } from './functions';
+import logger from './logger';
 
 export * from './functions.any';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 /**
  * Adds a Jitsi link to a calendar entry.
  *

react/features/calendar-sync/functions.web.js

@@ -18,7 +18,7 @@ import { googleCalendarApi } from './web/googleCalendar';
 import { microsoftCalendarApi } from './web/microsoftCalendar';
 import { toState } from '../base/redux';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
+import logger from './logger';
 
 /**
  * Determines whether the calendar feature is enabled by the web.

react/features/calendar-sync/logger.js

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

react/features/conference/components/web/Conference.js

@@ -23,6 +23,7 @@ import {
 } from '../../../toolbox';
 
 import { maybeShowSuboptimalExperienceNotification } from '../../functions';
+import logger from '../../logger';
 
 import Labels from './Labels';
 import { default as Notice } from './Notice';
@@ -31,15 +32,12 @@ import {
     AbstractConference,
     abstractMapStateToProps
 } from '../AbstractConference';
-
 import type { AbstractProps } from '../AbstractConference';
 
 declare var APP: Object;
 declare var config: Object;
 declare var interfaceConfig: Object;
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 /**
  * DOM events for when full screen mode has changed. Different browsers need
  * different vendor prefixes.

react/features/conference/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../base/logging/functions';
+
+export default getLogger('features/conference');

react/features/desktop-picker/functions.js

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

react/features/desktop-picker/logger.js

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

react/features/device-selection/actions.js

@@ -16,8 +16,7 @@ import { updateSettings } from '../base/settings';
 
 import { SET_DEVICE_SELECTION_POPUP_DATA } from './actionTypes';
 import { getDeviceSelectionDialogProps, processExternalDeviceRequest } from './functions';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
  * Opens a popup window with the device selection dialog in it.

react/features/device-selection/components/DeviceSelection.js

@@ -7,13 +7,13 @@ import type { Props as AbstractDialogTabProps } from '../../base/dialog';
 import { translate } from '../../base/i18n';
 import JitsiMeetJS, { createLocalTrack } from '../../base/lib-jitsi-meet';
 
+import logger from '../logger';
+
 import AudioInputPreview from './AudioInputPreview';
 import AudioOutputPreview from './AudioOutputPreview';
 import DeviceSelector from './DeviceSelector';
 import VideoInputPreview from './VideoInputPreview';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 /**
  * The type of the React {@code Component} props of {@link DeviceSelection}.
  */

react/features/device-selection/logger.js

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

react/features/dropbox/functions.any.js

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

react/features/dropbox/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../base/logging/functions';
+
+export default getLogger('features/dropbox');

react/features/follow-me/logger.js

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

react/features/follow-me/middleware.js

@@ -16,8 +16,7 @@ import { setFilmstripVisible } from '../filmstrip';
 import { setTileView } from '../video-layout';
 
 import { FOLLOW_ME_COMMAND } from './constants';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 declare var APP: Object;
 

react/features/invite/actions.js

@@ -21,8 +21,7 @@ import {
     getDialInNumbers,
     invitePeopleAndChatRooms
 } from './functions';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
  * Creates a (redux) action to signal that a click/tap has been performed on

react/features/invite/components/add-people-dialog/AbstractAddPeopleDialog.js

@@ -16,7 +16,7 @@ import {
     showNotification
 } from '../../../notifications';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
+import logger from '../../logger';
 
 export type Props = {
 

react/features/invite/components/info-dialog/web/InfoDialog.js

@@ -18,11 +18,10 @@ import {
     _getDefaultPhoneNumber,
     getDialInfoPageURL
 } from '../../../functions';
+import logger from '../../../logger';
 import DialInNumber from './DialInNumber';
 import PasswordForm from './PasswordForm';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 /**
  * The type of the React {@code Component} props of {@link InfoDialog}.
  */

react/features/invite/functions.js

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

react/features/invite/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../base/logging/functions';
+
+export default getLogger('features/invite');

react/features/invite/middleware.any.js

@@ -45,10 +45,9 @@ import {
     OUTGOING_CALL_RINGING_SOUND_ID,
     OUTGOING_CALL_START_SOUND_ID
 } from './constants';
+import logger from './logger';
 import { sounds } from './sounds';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 declare var interfaceConfig: Object;
 
 /**

react/features/invite/reducer.js

@@ -11,8 +11,7 @@ import {
     UPDATE_DIAL_IN_NUMBERS_FAILED,
     UPDATE_DIAL_IN_NUMBERS_SUCCESS
 } from './actionTypes';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 const DEFAULT_STATE = {
     /**

react/features/local-recording/controller/RecordingController.js

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

react/features/local-recording/logger.js

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

react/features/local-recording/recording/AbstractAudioContextAdapter.js

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

react/features/local-recording/recording/OggAdapter.js

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

react/features/local-recording/recording/WavAdapter.js

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

react/features/local-recording/recording/flac/FlacAdapter.js

@@ -1,3 +1,4 @@
+import logger from '../../logger';
 import {
     DEBUG,
     MAIN_THREAD_FINISH,
@@ -9,8 +10,6 @@ import {
 
 import { AbstractAudioContextAdapter } from '../AbstractAudioContextAdapter';
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 /**
  * Recording adapter that uses libflac.js in the background.
  */

react/features/local-recording/recording/flac/flacEncodeWorker.js

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

react/features/local-recording/session/SessionManager.js

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

react/features/mobile/audio-mode/logger.js

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

react/features/mobile/audio-mode/middleware.js

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

react/features/mobile/picture-in-picture/actions.js

@@ -7,8 +7,7 @@ import { PIP_ENABLED, getFeatureFlag } from '../../base/flags';
 import { Platform } from '../../base/react';
 
 import { ENTER_PICTURE_IN_PICTURE } from './actionTypes';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**
  * Enters (or rather initiates entering) picture-in-picture.

react/features/mobile/picture-in-picture/logger.js

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

react/features/mobile/watchos/logger.js

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

react/features/mobile/watchos/middleware.js

@@ -17,8 +17,7 @@ import {
 
 import { setConferenceTimestamp, setSessionId, setWatchReachable } from './actions';
 import { CMD_HANG_UP, CMD_JOIN_CONFERENCE, CMD_SET_MUTED, MAX_RECENT_URLS } from './constants';
-
+import logger from './logger';
-const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 const watchOSEnabled = Platform.OS === 'ios';
 

react/features/overlay/components/AbstractPageReloadOverlay.js

@@ -14,12 +14,11 @@ import {
     isFatalJitsiConnectionError
 } from '../../base/lib-jitsi-meet';
 
+import logger from '../logger';
 import ReloadButton from './web/ReloadButton';
 
 declare var APP: Object;
 
-const logger = require('jitsi-meet-logger').getLogger(__filename);
-
 /**
  * The type of the React {@code Component} props of
  * {@link AbstractPageReloadOverlay}.

react/features/overlay/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../base/logging/functions';
+
+export default getLogger('features/overlay');

react/features/recent-list/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../base/logging/functions';
+
+export default getLogger('features/recent-list');