Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion WORKERS/clone-worker/src/GitHandler/PathCheck.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import logger from "../../logger/logger.js";

export async function folderCheck(repoUrl: string, path: string, branch = "main") {
try {
const url = new URL(repoUrl);
Expand Down Expand Up @@ -29,6 +31,6 @@ export async function folderCheck(repoUrl: string, path: string, branch = "main"
// Lol i will surely remove it , PINKY PROMISE HAHAHAHAHAHHA!
return true;
} catch (error: any) {
console.error("Error checking folder:", error);
logger.error("Error checking folder:", { error });
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import path from "path";
import fs from "fs";
import logger from "../../../logger/logger.js";

// Types
interface PackageJSON {
Expand Down Expand Up @@ -68,7 +69,7 @@ export function detectNodeVersion(projectDir: string): string {
return resolveEngineRange(pkg.engines.node);
}
} catch (err) {
console.warn("Error parsing package.json:", err);
logger.warn("Error parsing package.json:", { error: err });
}
}

Expand Down
3 changes: 2 additions & 1 deletion api-gateway/src/Queue/build-queue.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { Queue } from 'bullmq';
import {Redis} from 'ioredis';
import logger from "../logger/logger.js";
const connection = new Redis({
host:process.env.REDIS_HOST || "internal-redis",
port: 6379
})

export const buildQueue = new Queue('buildQueue', { connection });
// await buildQueue.obliterate({ force: true });
console.log("Queue cleared!");
logger.info("Build queue initialized");
3 changes: 2 additions & 1 deletion api-gateway/src/Queue/clone-queue.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { Queue } from 'bullmq';
import {Redis} from 'ioredis';
import logger from "../logger/logger.js";
const connection = new Redis({
host:process.env.REDIS_HOST || "internal-redis",
port: 6379
})

export const cloneQueue = new Queue('cloneQueue', { connection });
await cloneQueue.obliterate({ force: true });
console.log("Queue cleared!");
logger.info("Clone queue initialized");
11 changes: 6 additions & 5 deletions api-gateway/src/consumer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
import { repoAnalysisSuccessHandler } from "./controllers/internalService.controller.js";

import dotenv from 'dotenv';
import logger from "./logger/logger.js";
dotenv.config();

const sqs = new SQSClient({
Expand All @@ -33,7 +34,7 @@ export async function pollQueue() {

for (const msg of res.Messages) {
try {
console.log('Received:', msg.Body);
logger.info('Received message from SQS:', { body: msg.Body });

const event = JSON.parse(msg.Body!);

Expand All @@ -46,7 +47,7 @@ export async function pollQueue() {
})
);
} catch (err) {
console.error("Processing failed:", err);
logger.error("SQS message processing failed:", { error: err });
}
}
}
Expand Down Expand Up @@ -87,14 +88,14 @@ async function handleEvent(event: any) {
async function onRepoAnalysisSuccess(event: any) {
const { projectId, deploymentId } = event;
const { commitHash, commitMessage, config } = event.payload
console.log(projectId, deploymentId, commitHash, commitMessage);
logger.info("Repo analysis success event received", { projectId, deploymentId, commitHash, commitMessage });
repoAnalysisSuccessHandler(projectId, config, deploymentId, commitHash, commitMessage)
console.log("onRepoAnalysisSuccess");
logger.debug("Processing repo analysis success event");
}

async function AnalysisFailed(event: any) {
// update stage of deployment to failed + frontend udpate with issue
console.log("AnalysisFailed");
logger.info("Repo analysis failed event received");
}

/* ---------------- PRE BUILD QUEUE STAGE ---------------- */
Expand Down
7 changes: 4 additions & 3 deletions api-gateway/src/controllers/auth.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import User from "../models/user.model.js";
import ApiResponse from "../utils/api-utils/ApiResponse.js";
import { verifyJwt } from "../middlewares/auth.middlewares.js";
import jwt from "jsonwebtoken";
import logger from "../logger/logger.js";

// LOGIN CONTROLLER
const LoginController = asyncHandler(async (req: Request, res: Response) => {
Expand Down Expand Up @@ -70,7 +71,7 @@ const CallbackController = asyncHandler(async (req: Request, res: Response) => {

} catch (err: any) {
if (err instanceof ApiError) throw err;
console.error(err);
logger.error("GitHub OAuth Error", { error: err });
throw new ApiError(500, "GitHub OAuth Error");
}

Expand Down Expand Up @@ -98,9 +99,9 @@ const logOutController = asyncHandler(async (req: Request, res: Response) => {
}

// Destroy session
req.session.destroy(err => {
req.session.destroy((err: any) => {
if (err) {
console.error("Error while destroying session: ", err);
logger.error("Error while destroying session: ", { error: err });
}
});

Expand Down
3 changes: 2 additions & 1 deletion api-gateway/src/controllers/env.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Request, Response } from "express";
import asyncHandler from "../utils/api-utils/asyncHandler.js";
import ApiError from "../utils/api-utils/ApiError.js";
import {Project} from "@veren/domain";
import logger from "../logger/logger.js";

const updateEnv = asyncHandler(async (req: Request, res: Response) => {
const { projectId } = req.params;
Expand Down Expand Up @@ -34,7 +35,7 @@ const updateEnv = asyncHandler(async (req: Request, res: Response) => {
return res.status(200).json(updatedProject);

} catch (error) {
console.error(error);
logger.error("Server error updating environment variables", { error: error });
return res.status(500).json({ message: "Server error" });
}
})
Expand Down
3 changes: 2 additions & 1 deletion api-gateway/src/controllers/healthCheck.controller.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Request, Response } from "express";
import logger from "../logger/logger.js";

export default function healthCheck(req: Request, res: Response){
console.log("Everything is working fine in api-gateway end !");
logger.info("API Gateway health check endpoint accessed");
res.status(200).json({msg:"OKAY ITS WORKING"})
}
7 changes: 4 additions & 3 deletions api-gateway/src/controllers/projects.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {Project, IProject} from "@veren/domain";
import ApiError from "../utils/api-utils/ApiError.js";
import ApiResponse from "../utils/api-utils/ApiResponse.js";
import asyncHandler from "../utils/api-utils/asyncHandler.js";
import logger from "../logger/logger.js";

/* THIS IS ONLY ACCESIBLE TO FRONTEND USER */
const createProject = asyncHandler(async (req: Request, res: Response) => {
Expand Down Expand Up @@ -63,17 +64,17 @@ const createProject = asyncHandler(async (req: Request, res: Response) => {
project = await Project.create(projectData)
} catch (error: any) {
if (error.code == 11000) {
console.log("INSIDE MONGO ERROR CATCHED", error.message)
logger.error("MongoDB duplicate key error", { message: error.message });
return res.status(409).json({
error: "Project name already taken"
})
}
console.log("INSIDE MONGO ERROR CATCHED", error.message)
logger.error("MongoDB error in project creation", { message: error.message });
throw new ApiError(500, "Internal server error");
}

if (!project) {
console.log("Not of project error")
logger.error("Project creation failed - no project returned");
throw new ApiError(500, "Unable to Create Project At the moment.");
}

Expand Down
5 changes: 3 additions & 2 deletions api-gateway/src/controllers/repo.controller.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Request, Response } from "express";
import logger from "../logger/logger.js";

export async function getAllRepositoryOfCurrentUser(req: Request, res: Response) {

Expand Down Expand Up @@ -44,7 +45,7 @@ export async function getAllRepositoryOfCurrentUser(req: Request, res: Response)
})

} catch (error: any) {
console.error(error);
logger.error("Error fetching Github repos", { error: error });
res.status(500).json({
success: false,
message: "Error fetching Github repos",
Expand Down Expand Up @@ -219,7 +220,7 @@ export async function repoFinder(req: Request, res: Response) {
return res.json(dedup(publicRepos));

} catch (err) {
console.error(err);
logger.error("Server error in repo finder", { error: err });
return res.status(500).json({ error: "Server error" });
}
}
Expand Down
3 changes: 2 additions & 1 deletion api-gateway/src/controllers/router.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Request, Response } from "express";
import axios from "axios";
import logger from "../logger/logger.js";

// HANDLE URL PATH (FORWARD FOR PREPROCESSING)
export async function RouteHandler(req: Request, res: Response) {
Expand All @@ -10,7 +11,7 @@ export async function RouteHandler(req: Request, res: Response) {
{ timeout: 10000 }
);

console.log("Response from router service:", response.data);
logger.info("Response from router service:", { data: response.data });

return res.json({
success: true,
Expand Down
3 changes: 2 additions & 1 deletion api-gateway/src/db/postgresDb.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Pool, Client } from 'pg';
import logger from "../logger/logger.js";

const user = process.env.POSTGRES_USER
const password = process.env.POSTGRES_PASSWORD
Expand All @@ -21,7 +22,7 @@ async function testConnection() {
try {

} catch (error) {
console.error('Error connecting to the POSTGRES:', error);
logger.error('Error connecting to the POSTGRES:', { error });
}
}

Expand Down
4 changes: 2 additions & 2 deletions api-gateway/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ async function init() {

// Start SQS polling concurrently
(async function pollLoop() {
console.log("Polling SQS...");
logger.info("Starting SQS polling...");
while (true) {
try {
await pollQueue();
} catch (err) {
console.error("Polling error:", err);
logger.error("SQS polling error:", { error: err });
}
}
})();
Expand Down
7 changes: 4 additions & 3 deletions api-gateway/src/middlewares/auth.middlewares.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import User from "../models/user.model.js";
import ApiError from "../utils/api-utils/ApiError.js";
import asyncHandler from "../utils/api-utils/asyncHandler.js";
import { Request, Response, NextFunction } from "express";
import logger from "../logger/logger.js";

interface AuthRequest extends Request {
user?: {
Expand All @@ -17,11 +18,11 @@ export const verifyJwt = asyncHandler(
const token =
req.cookies?.accessToken ||
req.headers.authorization?.split(" ")[1];
console.log(req.cookies, req.headers)
logger.debug("Checking authentication", { cookies: req.cookies, headers: req.headers });
if (!token) {
throw new ApiError(401, "No access token provided");
}
console.log(req.cookies, req.headers)
logger.debug("Checking authentication", { cookies: req.cookies, headers: req.headers });
const ACCESS_TOKEN_SECRET = process.env.ACCESS_TOKEN_SECRET;
if (!ACCESS_TOKEN_SECRET) {
throw new ApiError(500, "Access token secret not configured");
Expand All @@ -41,7 +42,7 @@ console.log(req.cookies, req.headers)
if (!user) {
throw new ApiError(404, "User not found");
}
console.log(user);
logger.debug("Authenticated user", { user: user._id });
req.user = {
id: user._id.toString(),
provider: user.provider,
Expand Down
19 changes: 10 additions & 9 deletions notification-service/src/controllers/logs.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { createClient } from '@clickhouse/client'
import path from "path";
import fs from "fs";
import { Kafka } from "kafkajs";
import logger from "../logger/logger.js";

const client = createClient({
host: process.env.CLICKHOUSE_HOST,
Expand Down Expand Up @@ -62,7 +63,7 @@ async function flushToClickHouse() {
format: 'JSONEachRow'
});
} catch (error) {
console.log(`Error while pushing to clickhouse`, error);
logger.error(`Error while pushing to clickhouse`, { error });

buffer = rows.concat(buffer).slice(0,10_000);
} finally {
Expand All @@ -82,13 +83,13 @@ export default async function initkafkaConsumer() {
const raw = message.value?.toString();
if (!raw) return;

console.log(`[${topic}] ${message.offset}: ${raw}`);
logger.info(`[${topic}] ${message.offset}: ${raw}`);

let payload;
try {
payload = JSON.parse(raw);
} catch (error) {
console.error('Invalid JSON:', raw);
logger.error('Invalid JSON:', { raw });
return;
}

Expand All @@ -102,17 +103,17 @@ export default async function initkafkaConsumer() {
});

if (buffer.length >= BATCH_SIZE) {
flushToClickHouse().catch(err =>
console.error("Async flush failed", err)
);
flushToClickHouse().catch((err) => {
logger.error("Async flush failed", { error: err });
});
}

if (!flushTimer) {
flushTimer = setTimeout(async () => {
flushTimer = null;
flushToClickHouse().catch(err =>
console.error("Async flush failed", err)
);
flushToClickHouse().catch((err) => {
logger.error("Async flush failed", { error: err });
});
}, FLUSH_INTERVAL_MS)
}

Expand Down
3 changes: 2 additions & 1 deletion orchestrate-service/src/controllers/container.controller.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {Request, Response} from 'express'
import ApiResponse from '../utils/api-utils/ApiResponse.js'
import Docker from 'dockerode'
import logger from "../logger/logger.js"

const docker = new Docker({ socketPath: "/var/run/docker.sock" });

Expand All @@ -23,7 +24,7 @@ export async function containerRouter(req: Request, res: Response){
const imageName = `${image}:${tag}`;

if(!imageAlreadyExist){
console.log(`Pulling Image: ${imageName}`);
logger.info(`Pulling Image: ${imageName}`);
await docker.pull(imageName);
}

Expand Down
Loading