From e86cf2dbf282ffbf84ff306411c9021a96799330 Mon Sep 17 00:00:00 2001
From: zkldi <ktchidev@gmail.com>
Date: Wed, 3 Nov 2021 00:48:13 +0000
Subject: [PATCH] Add an email logger and an email debug confjson5 param.

---
 server/src/lib/email/client.ts | 5 +++++
 server/src/lib/setup/config.ts | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/server/src/lib/email/client.ts b/server/src/lib/email/client.ts
index c5e043f2a..6be9ee026 100644
--- a/server/src/lib/email/client.ts
+++ b/server/src/lib/email/client.ts
@@ -12,9 +12,14 @@ if (ServerConfig.EMAIL_CONFIG) {
 
 	try {
 		transporter = nodemailer.createTransport({
+			// @ts-expect-error There's a bug in nodemailers types
+			// where it thinks that sendmail cannot be true while
+			// debug or logging are enabled.
 			sendmail: true,
 			newline: "unix",
 			path: conf.SENDMAIL_BIN ?? "/usr/bin/sendmail",
+			debug: !!ServerConfig.EMAIL_CONFIG?.DEBUG,
+			logger: CreateLogCtx("email-server"),
 		});
 
 		transporter.verify((err) => {
diff --git a/server/src/lib/setup/config.ts b/server/src/lib/setup/config.ts
index 5b908bed4..6adad179a 100644
--- a/server/src/lib/setup/config.ts
+++ b/server/src/lib/setup/config.ts
@@ -71,6 +71,7 @@ export interface TachiConfig {
 		FROM: string;
 		SENDMAIL_BIN?: string;
 		DKIM?: SendMailOptions["dkim"];
+		DEBUG?: boolean;
 	};
 	USC_QUEUE_SIZE: integer;
 	BEATORAJA_QUEUE_SIZE: integer;
@@ -116,6 +117,7 @@ const err = p(config, {
 		FROM: "string",
 		SENDMAIL_BIN: "*string",
 		DKIM: "*object",
+		DEBUG: "*boolean",
 	}),
 	USC_QUEUE_SIZE: p.optional(p.gteInt(2)),
 	BEATORAJA_QUEUE_SIZE: p.optional(p.gteInt(2)),