🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
wip
Edward Cui8a1d3551d464
diff --git a/server/src/services/import/workers/csvParseWorker.ts b/server/src/services/import/workers/csvParseWorker.tsindex 56bd6fca8..accbee375 100644--- a/server/src/services/import/workers/csvParseWorker.ts+++ b/server/src/services/import/workers/csvParseWorker.ts@@ -11,20 +11,11 @@ export async function registerCsvParseWorker() {await boss.work(CSV_PARSE_QUEUE, { batchSize: 1, pollingIntervalSeconds: 10 }, async ([ job ]: Job<CsvParseJob>[]) => {const { site, importId, source, tempFilePath, organization } = job.data;- const cleanup = async () => {- try {- await fs.promises.unlink(tempFilePath);- console.log(`Deleted temporary file: ${tempFilePath}`);- } catch (error) {- console.error(`Failed to delete file ${tempFilePath}:`, error);- }- };-try {const importableEvents = await ImportLimiter.countImportableEvents(organization);if (importableEvents <= 0) {await ImportStatusManager.updateStatus(importId, "failed", "Event import limit reached");- await cleanup();+ await fs.promises.unlink(tempFilePath);return;}@@ -103,7 +94,7 @@ export async function registerCsvParseWorker() {// });console.log(`Queued ${chunkNumber} chunks and completion job for import ${importId}`);- await cleanup();+ await fs.promises.unlink(tempFilePath);resolve();} catch (error) {reject(error);@@ -120,7 +111,7 @@ export async function registerCsvParseWorker() {"failed",error instanceof Error ? error.message : "Unknown error occurred");- await cleanup();+ await fs.promises.unlink(tempFilePath);throw error;}});diff --git a/server/src/services/import/workers/dataInsertWorker.ts b/server/src/services/import/workers/dataInsertWorker.tsindex a758b5681..92685fab1 100644--- a/server/src/services/import/workers/dataInsertWorker.ts+++ b/server/src/services/import/workers/dataInsertWorker.ts@@ -7,7 +7,7 @@ import { ImportStatusManager } from "../importStatusManager.js";export async function registerDataInsertWorker() {await boss.work(DATA_INSERT_QUEUE, { batchSize: 1, pollingIntervalSeconds: 2 }, async ([ job ]: Job<DataInsertJob>[]) => {- const { site, importId, source, chunk, chunkNumber, finalChunk } = job.data;+ const { site, importId, source, chunk, chunkNumber } = job.data;try {const getImportDataMapping = (source: string) => {@@ -34,10 +34,6 @@ export async function registerDataInsertWorker() {importId,transformedRecords.length);-- if (finalChunk) {- await ImportStatusManager.updateStatus(importId, "completed");- }} catch (error) {console.error("Error in data insert worker:", error);await ImportStatusManager.updateStatus(importId, "failed", "Error inserting chunk");diff --git a/server/src/services/import/workers/jobs.ts b/server/src/services/import/workers/jobs.tsindex 555e9bfac..32a5f7984 100644--- a/server/src/services/import/workers/jobs.ts+++ b/server/src/services/import/workers/jobs.ts@@ -18,5 +18,4 @@ export interface CsvParseJob extends ImportJob {export interface DataInsertJob extends ImportJob {chunk: UmamiEvent[];chunkNumber: number;- finalChunk: boolean;}