diff --git a/.env-transcribe-sample b/.env-transcribe-sample index 433508f0c5..eb715fed33 100644 --- a/.env-transcribe-sample +++ b/.env-transcribe-sample @@ -11,8 +11,9 @@ QUEUE_RETRY_COUNT=2 QUEUE_MAINTENANCE_INTERVAL=30000 HTR_CLI_DOCKER_IMAGE=joplin/htr-cli:0.0.2 -# Fullpath to images folder -HTR_CLI_IMAGES_FOLDER=/home/user/joplin/packages/transcribe/images +# Fullpath to images folder e.g.: +#HTR_CLI_IMAGES_FOLDER=/home/user/joplin/packages/transcribe/images +HTR_CLI_IMAGES_FOLDER= QUEUE_DRIVER=pg # QUEUE_DRIVER=sqlite diff --git a/packages/transcribe/entrypoint.sh b/packages/transcribe/entrypoint.sh index 302ab99e3b..0af09ab48c 100755 --- a/packages/transcribe/entrypoint.sh +++ b/packages/transcribe/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash if [ ! -f "/images/$1" ]; then - echo "Error: Image file /images/$1 does not exist." + echo "Error: Image file /images/$1 does not exist. Check if HTR_CLI_IMAGES_FOLDER environment variable is set correctly." exit 1 fi diff --git a/packages/transcribe/src/api/app.ts b/packages/transcribe/src/api/app.ts index 8cf82f4f5e..000bce7d01 100644 --- a/packages/transcribe/src/api/app.ts +++ b/packages/transcribe/src/api/app.ts @@ -43,6 +43,7 @@ const init = async () => { const checkServerConfigurations = (envVariables: EnvVariables) => { if (!envVariables.API_KEY) throw Error('API_KEY environment variable not set.'); + if (!envVariables.HTR_CLI_IMAGES_FOLDER) throw Error('HTR_CLI_IMAGES_FOLDER environment variable not set. This should point to a folder where images will be stored.'); }; const main = async () => { diff --git a/packages/transcribe/src/env.ts b/packages/transcribe/src/env.ts index c8034b13bd..5d147b64b0 100644 --- a/packages/transcribe/src/env.ts +++ b/packages/transcribe/src/env.ts @@ -6,7 +6,7 @@ export const defaultEnvValues: EnvVariables = { QUEUE_RETRY_COUNT: 2, QUEUE_MAINTENANCE_INTERVAL: 60000, HTR_CLI_DOCKER_IMAGE: 'joplin/htr-cli:0.0.2', - HTR_CLI_IMAGES_FOLDER: '/home/js/joplin/packages/transcribe/images', + HTR_CLI_IMAGES_FOLDER: '', QUEUE_DRIVER: 'pg', // 'sqlite' QUEUE_DATABASE_PASSWORD: '', QUEUE_DATABASE_NAME: '', diff --git a/packages/transcribe/src/workers/JobProcessor.ts b/packages/transcribe/src/workers/JobProcessor.ts index cce5f541e6..5b19e291a2 100644 --- a/packages/transcribe/src/workers/JobProcessor.ts +++ b/packages/transcribe/src/workers/JobProcessor.ts @@ -54,7 +54,7 @@ export default class JobProcessor { try { await this.checkForJobs(); } catch (error) { - logger.error(`Error while processing job: ${this.currentJob}`, error); + logger.error(`Error while processing job: ${this.currentJob?.id}`, error); const e = error as Error; if (this.currentJob) { await this.queue.fail(this.currentJob.id, e);