Skip to content

Commit

Permalink
Merge pull request matrix-org#1056 from uhoreg/fix_logger_path
Browse files Browse the repository at this point in the history
fix the path in references to logger.js
  • Loading branch information
uhoreg authored Oct 26, 2019
2 parents fffd2eb + e9908b1 commit 35adb75
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/algorithms/megolm.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/http-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/interactive-auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/models/event-timeline-set.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/models/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/models/room-state.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/models/room.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/realtime-callbacks.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/scheduler.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion src/store/indexeddb-local-backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/store/indexeddb-remote-backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/store/indexeddb-store-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/store/indexeddb.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/sync-accumulator.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
*/

import utils from "./utils";
import logger from '../src/logger';
import logger from './logger';


/**
Expand Down
2 changes: 1 addition & 1 deletion src/sync.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/timeline-window.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/webrtc/call.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 35adb75

Please sign in to comment.