Updated logger instances to use new logger module.

Author: digitalnomad91

src/auth/redis-auth.guard.ts

@@ -1,5 +1,5 @@
 import { Injectable, UnauthorizedException, CanActivate, ExecutionContext, createParamDecorator } from '@nestjs/common';
-import { LogService } from '../common/log/log.service';
+import { LoggerService } from '../common/logger/logger.service';
 import { RedisService } from '../common/redis/redis.service';
 import { RedisServer } from '../common/redis/redis.decorator';
 import { Observable } from 'rxjs';
@@ -10,7 +10,7 @@ import { DatabaseService } from '../common/database/database.service';
 export class RedisAuthGuard implements CanActivate {
   constructor(
     @RedisServer('AUTH') private redis: RedisService,
-    private readonly logService: LogService,
+    private readonly logger: LoggerService,
     private readonly databaseService: DatabaseService
   ) {}
 
@@ -42,7 +42,7 @@ export class RedisAuthGuard implements CanActivate {
       if (!user) throw new UnauthorizedException();
       request.user = user;
     } catch (e) {
-      console.log('error', e);
+      this.logger.error('error', e);
       throw new UnauthorizedException();
     }
 

src/cloudflare-kv/cloudflare-kv.service.ts

@@ -1,6 +1,6 @@
 import { Injectable, OnModuleInit } from '@nestjs/common';
 import { ConfigService } from './../common/configs/config.service';
-import { LogService } from './../common/log/log.service';
+import { LoggerService } from '../common/logger/logger.service';
 import { KvNamespaces } from './models/kv-namespaces.enum';
 
 @Injectable()
@@ -10,7 +10,7 @@ export class CloudflareKvService implements OnModuleInit {
 
   constructor(
     private readonly configService: ConfigService,
-    private readonly logService: LogService
+    private readonly logger: LoggerService
   ) {}
 
   onModuleInit() {
@@ -31,7 +31,7 @@ export class CloudflareKvService implements OnModuleInit {
 
       return response;
     } catch (e) {
-      this.logService.error('Failed to update workers KV', {
+      this.logger.error('Failed to update workers KV', {
         errorMessage: e.message,
       });
     }
@@ -50,7 +50,7 @@ export class CloudflareKvService implements OnModuleInit {
 
       return response.json();
     } catch (e) {
-      this.logService.error('Failed to update workers KV', {
+      this.logger.error('Failed to update workers KV', {
         errorMessage: e.message,
       });
     }

src/common/common.module.ts

@@ -2,13 +2,13 @@ import { Global, Module } from '@nestjs/common';
 import { DatabaseModule } from './database/database.module';
 //import { QueueModule } from './queue/queue.module';
 import { ConfigModule } from './configs/config.module';
-import { LogModule } from './log/log.module';
+//import { LogModule } from './log/log.module';
 import { TraceModule } from './trace/trace.module';
 import { RedisModule } from './redis/redis.module';
 
 @Global()
 @Module({
-  imports: [DatabaseModule, ConfigModule, LogModule, TraceModule, RedisModule.forRoot()],
-  exports: [DatabaseModule, ConfigModule, LogModule, TraceModule, RedisModule],
+  imports: [DatabaseModule, ConfigModule, TraceModule, RedisModule.forRoot()],
+  exports: [DatabaseModule, ConfigModule, TraceModule, RedisModule],
 })
 export class CommonModule {}

src/common/database/database.service.ts

@@ -1,11 +1,11 @@
 import { Injectable, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
-import { MeterProvider } from '@opentelemetry/sdk-metrics';
-import { Counter } from '@opentelemetry/api-metrics';
+//import { MeterProvider } from '@opentelemetry/sdk-metrics';
+//import { Counter } from '@opentelemetry/api-metrics';
 import { Prisma, PrismaClient, PrismaPromise } from '@prisma/client';
 import { ConfigService } from '../configs/config.service';
-import { LogService } from '../log/log.service';
+import { LoggerService } from '../logger/logger.service';
 import { TraceService } from '../trace/trace.service';
-import { logger } from '../../logger/logger';
+//import { logger } from '../../logger/logger';
 // Alternatively, if the above does not work
 // import { PrismaClient } from '../../node_modules/@prisma/client/dist/index';
 // No replacement needed, just remove this line
@@ -18,7 +18,7 @@ export class DatabaseService extends PrismaClient implements OnModuleInit, OnMod
   //private readonly pendingQueriesCounter: UpDownCounter;
 
   constructor(
-    private readonly logService: LogService,
+    private readonly logger: LoggerService,
     private readonly configService: ConfigService,
     private readonly traceService: TraceService //private readonly meter,
   ) {
@@ -35,7 +35,7 @@ export class DatabaseService extends PrismaClient implements OnModuleInit, OnMod
       //   },
       // ]
     });
-    logger.info(`Using Prisma v${Prisma.prismaVersion.client} ${configService.get('DATABASE_URL')}`);
+    this.logger.info(`Using Prisma v${Prisma.prismaVersion.client} ${configService.get('DATABASE_URL')}`);
 
     /* this.meter = meterProvider.getMeter('example-exporter-collector');
 
@@ -68,7 +68,7 @@ export class DatabaseService extends PrismaClient implements OnModuleInit, OnMod
 
     await (this as any).$connect();
 
-    this.logService.info(
+    this.logger.info(
       `Connected to ${prismaEngine.activeProvider} instance using Prisma v${prismaEngine.clientVersion} ${this.configService.get('DATABASE_URL')}`
     );
 
@@ -92,6 +92,6 @@ export class DatabaseService extends PrismaClient implements OnModuleInit, OnMod
   async onModuleDestroy(): Promise<void> {
     await super.$disconnect();
 
-    this.logService.debug('Disconnected from Postgres instance');
+    this.logger.debug('Disconnected from Postgres instance');
   }
 }

src/common/database/mongo-database.service.ts

@@ -2,7 +2,7 @@ import { Injectable, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import { MeterProvider } from '@opentelemetry/sdk-metrics';
 import { Counter } from '@opentelemetry/api';
 import { ConfigService } from './../configs/config.service';
-import { LogService } from './../log/log.service';
+import { LoggerService } from '../logger/logger.service';
 import { TraceService } from './../trace/trace.service';
 //export { default as DatabaseModel, Prisma as DatabaseClause, Prisma, PrismaClient, PrismaPromise } from '@prisma/client';
 import { PrismaClient as MongoPrismaClient, Prisma, PrismaPromise } from '@prisma/client';
@@ -13,7 +13,7 @@ export class MongoDatabaseService extends MongoPrismaClient implements OnModuleI
   //private readonly pendingQueriesCounter: UpDownCounter;
 
   constructor(
-    private readonly logService: LogService,
+    private readonly logger: LoggerService,
     private readonly configService: ConfigService,
     private readonly traceService: TraceService //private readonly meter,
   ) {
@@ -52,7 +52,7 @@ export class MongoDatabaseService extends MongoPrismaClient implements OnModuleI
 
     await this.$connect();
 
-    this.logService.info(
+    this.logger.info(
       `Connected to ${prismaEngine.activeProvider} instance using Prisma v${prismaEngine.clientVersion}`
     );
 
@@ -87,6 +87,6 @@ export class MongoDatabaseService extends MongoPrismaClient implements OnModuleI
   async onModuleDestroy(): Promise<void> {
     await this.$disconnect();
 
-    this.logService.debug('Disconnected from Mongo instance');
+    this.logger.debug('Disconnected from Mongo instance');
   }
 }

src/common/queue/queue.service.ts

@@ -3,7 +3,7 @@ import { Counter } from '@opentelemetry/api';
 //import { Meter } from '@opentelemetry/sdk-metrics-base';
 import { ConnectionOptions, Job as BullJob, JobsOptions, Queue, RedisClient } from 'bullmq';
 import { ConfigService } from '../configs/config.service';
-import { LogService } from '../log/log.service';
+import { LoggerService } from '../logger/logger.service';
 import { TraceService } from '../trace/trace.service';
 import { JobNames } from './models/job-names.enum';
 import { QueueNames } from './models/queue-names.enum';
@@ -20,7 +20,7 @@ export class QueueService implements OnModuleInit, OnModuleDestroy {
 
   constructor(
     private readonly configService: ConfigService,
-    private readonly logService: LogService,
+    private readonly logger: LoggerService,
     private readonly traceService: TraceService //private readonly meter: Meter,
   ) {
     /*this.queuedJobsCounter = this.meter.createCounter(
@@ -74,7 +74,7 @@ export class QueueService implements OnModuleInit, OnModuleDestroy {
         })
       );
 
-      this.logService.info('Connected to Redis');
+      this.logger.info('Connected to Redis');
     } catch (error) {
       this.onConnectionError(error);
     }
@@ -95,7 +95,7 @@ export class QueueService implements OnModuleInit, OnModuleDestroy {
       await this.bullQueues[queue].disconnect();
     }
 
-    this.logService.debug('Disconnected from Redis instance');
+    this.logger.debug('Disconnected from Redis instance');
   }
 
   /**
@@ -106,7 +106,7 @@ export class QueueService implements OnModuleInit, OnModuleDestroy {
    * @memberof QueueService
    */
   private onConnectionError(error: Error): void {
-    this.logService.error('Connection error', {
+    this.logger.error('Connection error', {
       errorMessage: error.message,
       errorStack: error.stack,
     });
@@ -124,7 +124,7 @@ export class QueueService implements OnModuleInit, OnModuleDestroy {
     });
 
     span.setAttributes({ id: job.id, name: job.name });
-    this.logService.info('Queued job', { id: job.id, name: job.name });
+    this.logger.info('Queued job', { id: job.id, name: job.name });
     span.end();
 
     return job;
@@ -154,7 +154,7 @@ export class QueueService implements OnModuleInit, OnModuleDestroy {
     const jobs = await this.bullQueues[queueName].addBulk(jobsPayload);
 
     const logJobs = jobs.map((job) => ({ id: job.id, name: job.name }));
-    this.logService.info('Queued jobs', {
+    this.logger.info('Queued jobs', {
       jobs: logJobs.length,
       jobsSamples: JSON.stringify(logJobs.slice(0, 100)),
     });

src/common/redis/redis.providers.ts

@@ -26,7 +26,7 @@ function redisFactory(redis: RedisService, prefix: string, cfg: ConfigService):
       throw new Error(`[REDIS] No server definition for prefix "${prefix}" in REDIS_SERVERS`);
     }
 
-    console.log(`[REDIS] Connecting to ${server.host}:${server.port}`);
+    //console.log(`[REDIS] Connecting to ${server.host}:${server.port}`);
 
     const redisOptions = {
       keepAlive: 30000,
@@ -155,4 +155,4 @@ export const redisProviders: Provider[] = [
 ];
 
 /* For visibility while booting */
-console.log('redisProviders', redisProviders);
+//console.log('redisProviders', redisProviders);

src/jobs/job.controller.ts

@@ -30,6 +30,7 @@ import { RedditService } from './reddit.service';
 import { NotificationsService } from './notifications.service';
 import { PaginatedResponse } from '../common/models/paginated-response';
 import { CreateJobDto as JobDto } from './dto/create-job.dto';
+import { LoggerService } from '../common/logger/logger.service';
 
 class PaginatedJobResponse extends PaginatedResponse(JobDto) {}
 
@@ -46,13 +47,12 @@ class PaginatedJobResponse extends PaginatedResponse(JobDto) {}
 @ApiTags('jobs')
 @Controller('jobs')
 export class JobController {
-  private readonly logger = new Logger(JobController.name);
-
   constructor(
     private readonly jobService: JobService,
     private readonly web3CareerService: Web3CareerService,
     private readonly redditService: RedditService,
-    private readonly notificationsService: NotificationsService
+    private readonly notificationsService: NotificationsService,
+    private readonly logger: LoggerService
   ) {}
 
   /**
@@ -91,7 +91,7 @@ export class JobController {
       },
     };
 
-    this.logger.log(
+    this.logger.info(
       `Job fetch summary: ${summary.totalFetched} total fetched (${summary.reddit.fetched} Reddit, ${summary.web3career.fetched} Web3Career), ${summary.totalAdded} added, ${summary.totalSkipped} skipped (existing)`
     );
 

src/jobs/reddit.service.ts

@@ -1,25 +1,27 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable, Logger as Logger2 } from '@nestjs/common';
 import { JobService } from './job.service';
 import { NotificationsService } from '../notifications/notifications.service';
 import { NotificationPayload } from '../notifications/interfaces/notification-payload.interface';
 import { DatabaseService } from '../common/database/database.service';
+import { LoggerService } from '../common/logger/logger.service';
 
 @Injectable()
 export class RedditService {
-  private readonly logger = new Logger(RedditService.name);
+  private readonly logger2 = new Logger2(RedditService.name);
 
   constructor(
     private readonly jobService: JobService,
     private readonly notificationsService: NotificationsService,
+    private readonly logger: LoggerService,
     private readonly db: DatabaseService
   ) {}
   async fetchRedditPosts(subreddits: string[]): Promise<any[]> {
     const axios = await import('axios');
     const allPosts = [];
-    this.logger.log(`Fetching posts from ${subreddits.length} subreddit(s)`);
+    this.logger.info(`Fetching posts from ${subreddits.length} subreddit(s)`);
     for (const subreddit of subreddits) {
       try {
-        this.logger.log(`Fetching /r/${subreddit}...`);
+        this.logger.info(`Fetching /r/${subreddit}...`);
         const response = await axios.default.get(`https://www.reddit.com/r/${subreddit}/new.json?limit=10`, {
           timeout: 5000,
         });
@@ -34,7 +36,7 @@ export class RedditService {
           upvotes: child.data.ups,
           downvotes: child.data.downs,
         }));
-        this.logger.log(`Found ${subredditPosts.length} post(s) in /r/${subreddit}`);
+        this.logger.info(`Found ${subredditPosts.length} post(s) in /r/${subreddit}`);
         allPosts.push(...subredditPosts);
       } catch (error: any) {
         this.logger.error(`Error fetching /r/${subreddit}:`, error.message);
@@ -46,7 +48,7 @@ export class RedditService {
   async storeRedditJobPosts(posts: any[]): Promise<any[]> {
     const newJobs = [];
     let skippedCount = 0;
-    this.logger.log(`Processing ${posts.length} Reddit post(s) for jobs table`);
+    this.logger.info(`Processing ${posts.length} Reddit post(s) for jobs table`);
     const subscriptions = await this.db.subscription.findMany();
     for (const post of posts) {
       try {
@@ -90,14 +92,14 @@ export class RedditService {
           this.notificationsService.sendNotification(sub, notificationPayload)
         );
         await Promise.all(notificationPromises);
-        this.logger.log(`Stored new job [${post.url}] from /u/${post.author}`);
+        this.logger.info(`Stored new job [${post.url}] from /u/${post.author}`);
         newJobs.push(upsertedJob);
       } catch (error: any) {
         this.logger.error(`Error processing Reddit post ${post.url}:`, error);
       }
     }
 
-    this.logger.log(
+    this.logger.info(
       `Reddit jobs processed: ${posts.length} fetched, ${skippedCount} skipped (existing), ${newJobs.length} added`
     );
 

src/jobs/web3career.service.ts

@@ -1,11 +1,13 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
+import { LoggerService } from '../common/logger/logger.service';
 import { JobService } from './job.service';
 
 @Injectable()
 export class Web3CareerService {
-  private readonly logger = new Logger(Web3CareerService.name);
-
-  constructor(private readonly jobService: JobService) {}
+  constructor(
+    private readonly jobService: JobService,
+    private readonly logger: LoggerService
+  ) {}
 
   private get web3CareerApiUrl(): string {
     const token = process.env.WEB3CAREER_API_TOKEN || 'Rg9PrsGP96Z2GB6T9tNZ1AzHzriQEwxa';
@@ -18,7 +20,7 @@ export class Web3CareerService {
       if (!response.ok) throw new Error(`Web3Career API request failed with status: ${response.status}`);
       const data = await response.json();
       const jobsArray = Array.isArray(data[2]) ? data[2] : [];
-      this.logger.log(`Web3Career jobs fetched: ${jobsArray.length}`);
+      this.logger.info(`Web3Career jobs fetched: ${jobsArray.length}`);
       return jobsArray;
     } catch (error: any) {
       this.logger.error(`Error fetching Web3Career jobs: ${error.message}`);
@@ -64,7 +66,7 @@ export class Web3CareerService {
       }
     }
 
-    this.logger.log(
+    this.logger.info(
       `Web3Career jobs processed: ${jobs.length} fetched, ${skippedCount} skipped (existing), ${newJobs.length} added`
     );