From 0bf69fef179c75627f90fb691d4c5829bf587ab4 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Sun, 19 May 2019 18:20:57 +0100
Subject: [PATCH] Cleanup logging, remove moment dependency
---
package.json | 4 +---
src/log.ts | 7 +------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/package.json b/package.json
index 65b0f11..3b8cb43 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 11c8688..0477d8a 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,
--
GitLab