From e9908b1d9709416c12bdaf276d2e9aeaaa7c10a0 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Fri, 25 Oct 2019 23:24:30 -0400 Subject: [PATCH] fix the path in references to logger.js --- src/client.js | 2 +- src/crypto/algorithms/megolm.js | 2 +- src/http-api.js | 2 +- src/interactive-auth.js | 2 +- src/models/event-timeline-set.js | 2 +- src/models/event.js | 2 +- src/models/room-state.js | 2 +- src/models/room.js | 2 +- src/realtime-callbacks.js | 2 +- src/scheduler.js | 2 +- src/store/indexeddb-local-backend.js | 2 +- src/store/indexeddb-remote-backend.js | 2 +- src/store/indexeddb-store-worker.js | 2 +- src/store/indexeddb.js | 2 +- src/sync-accumulator.js | 2 +- src/sync.js | 2 +- src/timeline-window.js | 2 +- src/webrtc/call.js | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/client.js b/src/client.js index ec0ee39b2a5..b14078fe74c 100644 --- a/src/client.js +++ b/src/client.js @@ -46,7 +46,7 @@ const olmlib = require("./crypto/olmlib"); import ReEmitter from './ReEmitter'; import RoomList from './crypto/RoomList'; -import logger from '../src/logger'; +import logger from './logger'; import Crypto from './crypto'; import { isCryptoAvailable } from './crypto'; diff --git a/src/crypto/algorithms/megolm.js b/src/crypto/algorithms/megolm.js index deeb865ec0a..4262c2cee5f 100644 --- a/src/crypto/algorithms/megolm.js +++ b/src/crypto/algorithms/megolm.js @@ -23,7 +23,7 @@ limitations under the License. */ import Promise from 'bluebird'; -import logger from '../../../src/logger'; +import logger from '../../logger'; const utils = require("../../utils"); const olmlib = require("../olmlib"); diff --git a/src/http-api.js b/src/http-api.js index 2dfb228ba9d..4babe9f514c 100644 --- a/src/http-api.js +++ b/src/http-api.js @@ -23,7 +23,7 @@ import Promise from 'bluebird'; const parseContentType = require('content-type').parse; const utils = require("./utils"); -import logger from '../src/logger'; +import logger from './logger'; // we use our own implementation of setTimeout, so that if we get suspended in // the middle of a /sync, we cancel the sync as soon as we awake, rather than diff --git a/src/interactive-auth.js b/src/interactive-auth.js index cc4fabc22a3..756756a2e3d 100644 --- a/src/interactive-auth.js +++ b/src/interactive-auth.js @@ -22,7 +22,7 @@ import Promise from 'bluebird'; const url = require("url"); const utils = require("./utils"); -import logger from '../src/logger'; +import logger from './logger'; const EMAIL_STAGE_TYPE = "m.login.email.identity"; const MSISDN_STAGE_TYPE = "m.login.msisdn"; diff --git a/src/models/event-timeline-set.js b/src/models/event-timeline-set.js index 0387bc4fd5c..0a860245857 100644 --- a/src/models/event-timeline-set.js +++ b/src/models/event-timeline-set.js @@ -21,7 +21,7 @@ const EventEmitter = require("events").EventEmitter; const utils = require("../utils"); const EventTimeline = require("./event-timeline"); import {EventStatus} from "./event"; -import logger from '../../src/logger'; +import logger from '../logger'; import Relations from './relations'; // var DEBUG = false; diff --git a/src/models/event.js b/src/models/event.js index 262795f51ed..6aa39c943d0 100644 --- a/src/models/event.js +++ b/src/models/event.js @@ -24,7 +24,7 @@ limitations under the License. import Promise from 'bluebird'; import {EventEmitter} from 'events'; import utils from '../utils.js'; -import logger from '../../src/logger'; +import logger from '../logger'; /** * Enum for event statuses. diff --git a/src/models/room-state.js b/src/models/room-state.js index 280b50a8a97..cb1579f4623 100644 --- a/src/models/room-state.js +++ b/src/models/room-state.js @@ -21,7 +21,7 @@ const EventEmitter = require("events").EventEmitter; const utils = require("../utils"); const RoomMember = require("./room-member"); -import logger from '../../src/logger'; +import logger from '../logger'; // possible statuses for out-of-band member loading const OOB_STATUS_NOTSTARTED = 1; diff --git a/src/models/room.js b/src/models/room.js index 453546f0f2d..44968771a45 100644 --- a/src/models/room.js +++ b/src/models/room.js @@ -30,7 +30,7 @@ const ContentRepo = require("../content-repo"); const EventTimeline = require("./event-timeline"); const EventTimelineSet = require("./event-timeline-set"); -import logger from '../../src/logger'; +import logger from '../logger'; import ReEmitter from '../ReEmitter'; // These constants are used as sane defaults when the homeserver doesn't support diff --git a/src/realtime-callbacks.js b/src/realtime-callbacks.js index 6e0e8891094..ee2faa1e564 100644 --- a/src/realtime-callbacks.js +++ b/src/realtime-callbacks.js @@ -24,7 +24,7 @@ limitations under the License. */ "use strict"; -import logger from '../src/logger'; +import logger from './logger'; // we schedule a callback at least this often, to check if we've missed out on // some wall-clock time due to being suspended. diff --git a/src/scheduler.js b/src/scheduler.js index a799597b9de..1b8d46f6779 100644 --- a/src/scheduler.js +++ b/src/scheduler.js @@ -21,7 +21,7 @@ limitations under the License. */ const utils = require("./utils"); import Promise from 'bluebird'; -import logger from '../src/logger'; +import logger from './logger'; const DEBUG = false; // set true to enable console logging. diff --git a/src/store/indexeddb-local-backend.js b/src/store/indexeddb-local-backend.js index 7d666279437..b1ddb144d29 100644 --- a/src/store/indexeddb-local-backend.js +++ b/src/store/indexeddb-local-backend.js @@ -19,7 +19,7 @@ import Promise from 'bluebird'; import SyncAccumulator from "../sync-accumulator"; import utils from "../utils"; import * as IndexedDBHelpers from "../indexeddb-helpers"; -import logger from '../../src/logger'; +import logger from '../logger'; const VERSION = 3; diff --git a/src/store/indexeddb-remote-backend.js b/src/store/indexeddb-remote-backend.js index 896d53b7478..920739b6eaf 100644 --- a/src/store/indexeddb-remote-backend.js +++ b/src/store/indexeddb-remote-backend.js @@ -16,7 +16,7 @@ limitations under the License. */ import Promise from 'bluebird'; -import logger from '../../src/logger'; +import logger from '../logger'; /** * An IndexedDB store backend where the actual backend sits in a web diff --git a/src/store/indexeddb-store-worker.js b/src/store/indexeddb-store-worker.js index 93d374d2f95..c47fcc176f8 100644 --- a/src/store/indexeddb-store-worker.js +++ b/src/store/indexeddb-store-worker.js @@ -17,7 +17,7 @@ limitations under the License. import Promise from 'bluebird'; import LocalIndexedDBStoreBackend from "./indexeddb-local-backend.js"; -import logger from '../../src/logger'; +import logger from '../logger'; /** * This class lives in the webworker and drives a LocalIndexedDBStoreBackend diff --git a/src/store/indexeddb.js b/src/store/indexeddb.js index dd8978b7623..f2f759de8bc 100644 --- a/src/store/indexeddb.js +++ b/src/store/indexeddb.js @@ -25,7 +25,7 @@ import LocalIndexedDBStoreBackend from "./indexeddb-local-backend.js"; import RemoteIndexedDBStoreBackend from "./indexeddb-remote-backend.js"; import User from "../models/user"; import {MatrixEvent} from "../models/event"; -import logger from '../../src/logger'; +import logger from '../logger'; /** * This is an internal module. See {@link IndexedDBStore} for the public class. diff --git a/src/sync-accumulator.js b/src/sync-accumulator.js index 1810429df20..8d9b3b7875a 100644 --- a/src/sync-accumulator.js +++ b/src/sync-accumulator.js @@ -21,7 +21,7 @@ limitations under the License. */ import utils from "./utils"; -import logger from '../src/logger'; +import logger from './logger'; /** diff --git a/src/sync.js b/src/sync.js index 765bf73b614..590cc16b494 100644 --- a/src/sync.js +++ b/src/sync.js @@ -33,7 +33,7 @@ const utils = require("./utils"); const Filter = require("./filter"); const EventTimeline = require("./models/event-timeline"); const PushProcessor = require("./pushprocessor"); -import logger from '../src/logger'; +import logger from './logger'; import {InvalidStoreError} from './errors'; diff --git a/src/timeline-window.js b/src/timeline-window.js index d2ec174d269..a3edabcd0f9 100644 --- a/src/timeline-window.js +++ b/src/timeline-window.js @@ -19,7 +19,7 @@ limitations under the License. import Promise from 'bluebird'; const EventTimeline = require("./models/event-timeline"); -import logger from '../src/logger'; +import logger from './logger'; /** * @private diff --git a/src/webrtc/call.js b/src/webrtc/call.js index d0f5311e812..f5819c74645 100644 --- a/src/webrtc/call.js +++ b/src/webrtc/call.js @@ -21,7 +21,7 @@ limitations under the License. */ const utils = require("../utils"); const EventEmitter = require("events").EventEmitter; -import logger from '../../src/logger'; +import logger from '../logger'; const DEBUG = true; // set true to enable console logging. // events: hangup, error(err), replaced(call), state(state, oldState)