Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
maamalama committed Sep 18, 2024
1 parent 519311d commit 91b4634
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
4 changes: 2 additions & 2 deletions valhalla/jawn/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import * as publicSwaggerDoc from "./tsoa-build/public/swagger.json";
import { initLogs } from "./utils/injectLogs";
import { initSentry } from "./utils/injectSentry";
import { startConsumers } from "./workers/consumerInterface";
import { ShutdownService } from "./lib/shared/ShutdownService";
import { DelayedOperationService } from "./lib/shared/delayedOperationService";

export const ENVIRONMENT: "production" | "development" = (process.env
.VERCEL_ENV ?? "development") as any;
Expand Down Expand Up @@ -211,7 +211,7 @@ async function gracefulShutdown(signal: string) {
server.close(async () => {
console.log("HTTP server closed.");

await ShutdownService.getInstance().executeShutdown();
await DelayedOperationService.getInstance().executeShutdown();

console.log("Graceful shutdown completed.");
process.exit(0);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
export class ShutdownService {
private static instance: ShutdownService;
export class DelayedOperationService {
private static instance: DelayedOperationService;
private delayedOperations: Map<NodeJS.Timeout, () => Promise<any>> =
new Map();
private static readonly SHUTDOWN_TIMEOUT = 120000; // 120 seconds timeout


public static getInstance(): ShutdownService {
if (!ShutdownService.instance) {
ShutdownService.instance = new ShutdownService();
public static getInstance(): DelayedOperationService {
if (!DelayedOperationService.instance) {
DelayedOperationService.instance = new DelayedOperationService();
}
return ShutdownService.instance;
return DelayedOperationService.instance;
}

public addDelayedOperation(
Expand Down Expand Up @@ -57,7 +56,7 @@ export class ShutdownService {
new Promise((_, reject) =>
setTimeout(
() => reject(new Error("Shutdown timed out")),
ShutdownService.SHUTDOWN_TIMEOUT
DelayedOperationService.SHUTDOWN_TIMEOUT
)
),
]);
Expand Down
8 changes: 4 additions & 4 deletions valhalla/jawn/src/managers/score/ScoreManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { dataDogClient } from "../../lib/clients/DataDogClient";
import { KafkaProducer } from "../../lib/clients/KafkaProducer";
import { HeliconeScoresMessage } from "../../lib/handlers/HandlerContext";
import * as Sentry from "@sentry/node";
import { ShutdownService } from "../../lib/shared/ShutdownService";
import { DelayedOperationService } from "../../lib/shared/delayedOperationService";
import { BaseManager } from "../BaseManager";

type Scores = Record<string, number | boolean>;
Expand Down Expand Up @@ -52,7 +52,7 @@ export class ScoreManager extends BaseManager {
console.log("Kafka is not enabled. Using score manager");

// Schedule the delayed operation and register it with ShutdownService
const timeoutId = ShutdownService.getTimeoutId(() => {
const timeoutId = DelayedOperationService.getTimeoutId(() => {
return this.handleScores(
{
batchId: "",
Expand All @@ -65,7 +65,7 @@ export class ScoreManager extends BaseManager {
}, delayMs);

// Register the timeout and operation with ShutdownService
ShutdownService.getInstance().addDelayedOperation(timeoutId, () =>
DelayedOperationService.getInstance().addDelayedOperation(timeoutId, () =>
this.handleScores(
{
batchId: "",
Expand All @@ -92,7 +92,7 @@ export class ScoreManager extends BaseManager {
}, delayMs);

// Register the timeout and operation with ShutdownService
ShutdownService.getInstance().addDelayedOperation(timeoutId, () =>
DelayedOperationService.getInstance().addDelayedOperation(timeoutId, () =>
this.kafkaProducer.sendScoresMessage(
scoresMessage,
"helicone-scores-prod"
Expand Down

0 comments on commit 91b4634

Please sign in to comment.