Skip to content
Merged
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
15 changes: 13 additions & 2 deletions src/modules/processing/services/processing.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,11 @@ class ProcessingService {
}
}

private generateProcessingLogFilename(processing: IProcessing) {
const outputLogsFilename = `_autodroid_worker_processing_${processing.data.id}_output.log`;
return outputLogsFilename;
}

private async processExecution(processingId: string) {
try {
const processing = await this.getProcessing(processingId);
Expand Down Expand Up @@ -728,7 +733,8 @@ class ProcessingService {

const outputLogs = await this.getAllLogsFromContainer({ container });
if (outputLogs.trim().length > 0) {
const outputLogsFilename = `_autodroid_worker_processing_${processing.data.id}_output.log`;
const outputLogsFilename =
this.generateProcessingLogFilename(processing);
const outputLogsPath = path.join(
processing.system_output_dir,
outputLogsFilename,
Expand Down Expand Up @@ -851,9 +857,14 @@ class ProcessingService {
try {
const { processor } = processing.data;

const logFile = this.generateProcessingLogFilename(processing);

const resultFiles = await this.getMatchedFilesByGlobPatterns({
containerDir: processing.system_output_dir,
globPatterns: processor.configuration.output_result_file_glob_patterns,
globPatterns: [
...processor.configuration.output_result_file_glob_patterns,
logFile,
],
});

const metricsFiles = await this.getMatchedFilesByGlobPatterns({
Expand Down