Merge pull request #202 from github-community-projects/sutterj/log-fix

fix: add min level to logger
github-community-projects · Jul 8, 2024 · d071c5c · d071c5c
2 parents cdb56da + 0d7d976
commit d071c5c
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 6 deletions.
diff --git a/.env.example b/.env.example
@@ -19,7 +19,7 @@ ALLOWED_ORGS=
 WEBHOOK_SECRET=bad-secret
 
 # Use `trace` to get verbose logging or `info` to show less
-LOG_LEVEL=debug
+LOGGING_LEVEL=debug
 
 # Used for settings various configuration in the app
 NODE_ENV=development

diff --git a/env.mjs b/env.mjs
@@ -17,7 +17,7 @@ export const env = createEnv({
     PRIVATE_KEY: z.string(),
 
     // Optional environment variables
-    LOG_LEVEL: z.string().optional().default('debug'),
+    LOGGING_LEVEL: z.string().optional().default('debug'),
     NODE_ENV: z.string().optional().default('development'),
     PUBLIC_ORG: z.string().optional(),
     PRIVATE_ORG: z.string().optional(),
@@ -60,7 +60,7 @@ export const env = createEnv({
     NEXTAUTH_URL: process.env.NEXTAUTH_URL,
     WEBHOOK_SECRET: process.env.WEBHOOK_SECRET,
     PRIVATE_KEY: process.env.PRIVATE_KEY,
-    LOG_LEVEL: process.env.LOG_LEVEL,
+    LOGGING_LEVEL: process.env.LOGGING_LEVEL,
     NODE_ENV: process.env.NODE_ENV,
     PUBLIC_ORG: process.env.PUBLIC_ORG,
     PRIVATE_ORG: process.env.PRIVATE_ORG,

diff --git a/src/app/api/auth/lib/nextauth-options.ts b/src/app/api/auth/lib/nextauth-options.ts
@@ -157,18 +157,23 @@ export const nextAuthOptions: AuthOptions = {
           'No allowed handles or orgs specified, allowing all users.',
         )
 
+        authLogger.info('User is allowed to sign in:', profile.login)
+
         return true
       }
 
       authLogger.debug('Trying to sign in with handle:', profile.login)
 
       // If the user is in the allowed handles list, allow sign in
       if (allowedHandles.includes(profile.login)) {
+        authLogger.info('User is allowed to sign in:', profile.login)
+
         return true
       }
 
       authLogger.debug(
-        `User "${profile.login}" is not in the allowed handles list`,
+        'User is not in the allowed handles list:',
+        profile.login,
       )
 
       authLogger.debug(
@@ -188,13 +193,16 @@ export const nextAuthOptions: AuthOptions = {
       // Check if any of the user's organizations are in the allowed orgs list
       if (orgs.some((org) => allowedOrgs.includes(org.login))) {
         authLogger.info(
-          `User "${profile.login}" has an org in the allowed orgs list`,
+          'User has an org in the allowed orgs list:',
+          profile.login,
         )
 
+        authLogger.info('User is allowed to sign in:', profile.login)
+
         return true
       }
 
-      authLogger.warn(`User "${profile.login}" is not allowed to sign in`)
+      authLogger.warn('User is not allowed to sign in:', profile.login)
 
       return false
     },

diff --git a/src/server/repos/controller.ts b/src/server/repos/controller.ts
@@ -151,6 +151,11 @@ export const createMirrorHandler = async ({
       await git.checkoutBranch(input.newBranchName, defaultBranch)
       await git.push('origin', input.newBranchName)
 
+      reposApiLogger.info('Mirror created', {
+        org: newRepo.data.owner.login,
+        name: newRepo.data.name,
+      })
+
       return {
         success: true,
         data: newRepo.data,

diff --git a/src/utils/logger.ts b/src/utils/logger.ts
@@ -25,8 +25,21 @@ const getLoggerType = () => {
   return 'json'
 }
 
+// Map logger level name to number for tsLog
+const mapLevelToMethod: { [key: string]: number } = {
+  silly: 0,
+  trace: 1,
+  debug: 2,
+  info: 3,
+  warn: 4,
+  error: 5,
+  fatal: 6,
+}
+
 export const logger = new Logger({
   type: getLoggerType(),
+  minLevel:
+    mapLevelToMethod[process.env.LOGGING_LEVEL?.toLowerCase() || 'info'],
   maskValuesRegEx: [
     /"access[-._]?token":"[^"]+"/g,
     /"api[-._]?key":"[^"]+"/g,