From 18f7d51d0b606d41394f06e59ba7a374c1a26f1f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 28 Mar 2020 18:28:21 +0900
Subject: [PATCH] Improve log handling

---
 src/db/postgre.ts      | 5 ++++-
 src/services/logger.ts | 1 +
 test/chart.ts          | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/db/postgre.ts b/src/db/postgre.ts
index 021fe9ef6..57703fb09 100644
--- a/src/db/postgre.ts
+++ b/src/db/postgre.ts
@@ -57,6 +57,7 @@ import { Antenna } from '../models/entities/antenna';
 import { AntennaNote } from '../models/entities/antenna-note';
 import { PromoNote } from '../models/entities/promo-note';
 import { PromoRead } from '../models/entities/promo-read';
+import { program } from '../argv';
 
 const sqlLogger = dbLogger.createSubLogger('sql', 'white', false);
 
@@ -149,7 +150,7 @@ export const entities = [
 	...charts as any
 ];
 
-export function initDb(justBorrow = false, sync = false, log = false, forceRecreate = false) {
+export function initDb(justBorrow = false, sync = false, forceRecreate = false) {
 	if (!forceRecreate) {
 		try {
 			const conn = getConnection();
@@ -157,6 +158,8 @@ export function initDb(justBorrow = false, sync = false, log = false, forceRecre
 		} catch (e) {}
 	}
 
+	const log = program.verbose;
+
 	return createConnection({
 		type: 'postgres',
 		host: config.db.host,
diff --git a/src/services/logger.ts b/src/services/logger.ts
index 0e26e80ed..eb2b257dd 100644
--- a/src/services/logger.ts
+++ b/src/services/logger.ts
@@ -54,6 +54,7 @@ export default class Logger {
 	private log(level: Level, message: string, data?: Record<string, any> | null, important = false, subDomains: Domain[] = [], store = true): void {
 		if (program.quiet) return;
 		if (!this.store) store = false;
+		if (level === 'debug') store = false;
 
 		if (this.parentLogger) {
 			this.parentLogger.log(level, message, data, important, [this.domain].concat(subDomains), store);
diff --git a/test/chart.ts b/test/chart.ts
index 30dba9414..06c84a5b0 100644
--- a/test/chart.ts
+++ b/test/chart.ts
@@ -63,7 +63,7 @@ describe('Chart', () => {
 
 	after(async(async () => {
 		await connection.close();
-		await initDb(true, undefined, undefined, true);
+		await initDb(true, undefined, true);
 	}));
 
 	beforeEach(done => {