diff --git a/package.json b/package.json index 65b0f11aab44a5c847b82dbdbdc672fae253ad63..3b8cb43026ff6478ca80ad0879344c361c5ef35f 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ }, "homepage": "https://github.com/Half-Shot/matrix-appservice-discord#readme", "dependencies": { - "@types/p-queue": "^3.0.0", "better-sqlite3": "^5.0.1", "command-line-args": "^4.0.1", "command-line-usage": "^4.1.0", @@ -45,9 +44,8 @@ "js-yaml": "^3.13.1", "matrix-appservice-bridge": "matrix-org/matrix-appservice-bridge#8a7288edf1d1d1d1395a83d330d836d9c9bf1e76", "mime": "^1.6.0", - "moment": "^2.22.2", "node-html-parser": "^1.1.11", - "p-queue": "^3.0.0", + "p-queue": "^5.0.0", "pg-promise": "^8.5.1", "tslint": "^5.11.0", "typescript": "^3.1.3", diff --git a/src/log.ts b/src/log.ts index 11c86888f23a6cfa5a4dcd90ff0ad1bc6e355840..0477d8a1af5e77d3e47289f56a034a6afc3248e3 100644 --- a/src/log.ts +++ b/src/log.ts @@ -17,7 +17,6 @@ limitations under the License. import { createLogger, Logger, format, transports } from "winston"; import { DiscordBridgeConfigLogging, LoggingFile} from "./config"; import { inspect } from "util"; -import * as moment from "moment"; import "winston-daily-rotate-file"; const FORMAT_FUNC = format.printf((info) => { @@ -47,10 +46,6 @@ export class Log { private static config: DiscordBridgeConfigLogging; private static logger: Logger; - private static now() { - return moment().format(Log.config.lineDateFormat); - } - private static setupLogger() { if (Log.logger) { Log.logger.close(); @@ -64,7 +59,7 @@ export class Log { Log.logger = createLogger({ format: format.combine( format.timestamp({ - format: Log.now, + format: Log.config.lineDateFormat, }), format.colorize(), FORMAT_FUNC,