Skip to content
Merged
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
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sonar.projectKey=speedandfunction_automatization
sonar.organization=speedandfunction
sonar.javascript.lcov.reportPaths=workers/main/coverage/lcov.info
sonar.exclusions=**/src/__tests__/**,**/src/dist/**
sonar.exclusions=**/*.test.ts,**/src/dist/**
38 changes: 0 additions & 38 deletions workers/main/src/__tests__/index.test.ts

This file was deleted.

36 changes: 36 additions & 0 deletions workers/main/src/index.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { describe, expect, it, vi } from 'vitest';

import { handleRunError, logger } from './index';

describe('handleRunError', () => {
it('should log the error', () => {
const error = new Error('test error');
const logSpy = vi.spyOn(logger, 'error').mockImplementation(() => {});

handleRunError(error);
expect(logSpy).toHaveBeenCalledWith(
`Error in main worker: ${error.message}`,
);
logSpy.mockRestore();
});

it('should log when error is a string', () => {
const error = 'string error';
const logSpy = vi.spyOn(logger, 'error').mockImplementation(() => {});

handleRunError(error);
expect(logSpy).toHaveBeenCalledWith(`Error in main worker: ${error}`);
logSpy.mockRestore();
});

it('should log when error is an Error object', () => {
const error = new Error('error from Error object');
const logSpy = vi.spyOn(logger, 'error').mockImplementation(() => {});

handleRunError(error);
expect(logSpy).toHaveBeenCalledWith(
`Error in main worker: ${error.message}`,
);
logSpy.mockRestore();
});
});
9 changes: 5 additions & 4 deletions workers/main/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DefaultLogger, NativeConnection, Worker } from '@temporalio/worker';

import { logWorkerError, validateEnv } from '../../common/utils';
import { validateEnv } from './common/utils';
import { temporalConfig } from './configs/temporal';
import { workerConfig } from './configs/worker';

Expand Down Expand Up @@ -37,10 +37,11 @@ export async function run(): Promise<void> {
}
}

export function handleRunError(err: unknown): never {
logWorkerError('main', err);
export function handleRunError(error: unknown): void {
logger.error(
`Error in main worker: ${error instanceof Error ? error.message : String(error)}`,
);
setTimeout(() => process.exit(1), 100);
throw err;
}

export function mainEntry() {
Expand Down
2 changes: 1 addition & 1 deletion workers/main/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default defineConfig({
test: {
globals: true,
environment: 'node',
include: ['src/__tests__/**/*.test.ts'],
include: ['src/**/*.test.ts'],
coverage: {
provider: 'v8',
reporter: ['text', 'lcov'],
Expand Down