From 680e6721f136c34a263baf37a83f5f18b5e6ea3c Mon Sep 17 00:00:00 2001 From: Hamish Farroq Date: Sun, 14 Oct 2018 04:52:46 +0000 Subject: [PATCH 1/3] Fix spelling, MAYAN_WORKERS_... to MAYAN_WORKER_... --- docker/etc/supervisor/mayan.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/etc/supervisor/mayan.conf b/docker/etc/supervisor/mayan.conf index 2384831653..646be4c10b 100644 --- a/docker/etc/supervisor/mayan.conf +++ b/docker/etc/supervisor/mayan.conf @@ -22,7 +22,7 @@ user = root [program:mayan-worker-fast] autorestart = false autostart = true -command = nice -n 1 /bin/bash -c "${MAYAN_BIN} celery --settings=${MAYAN_SETTINGS_MODULE} worker -Ofair -l ERROR -Q converter,sources_fast -n mayan-worker-fast.%%h ${MAYAN_WORKERS_FAST_CONCURRENCY}" +command = nice -n 1 /bin/bash -c "${MAYAN_BIN} celery --settings=${MAYAN_SETTINGS_MODULE} worker -Ofair -l ERROR -Q converter,sources_fast -n mayan-worker-fast.%%h ${MAYAN_WORKER_FAST_CONCURRENCY}" killasgroup = true numprocs = 1 priority = 998 @@ -37,7 +37,7 @@ user = mayan [program:mayan-worker-medium] autorestart = false autostart = true -command = nice -n 18 /bin/bash -c "${MAYAN_BIN} celery --settings=${MAYAN_SETTINGS_MODULE} worker -Ofair -l ERROR -Q checkouts_periodic,documents_periodic,indexing,metadata,sources,sources_periodic,uploads,documents -n mayan-worker-medium.%%h ${MAYAN_WORKERS_MEDIUM_CONCURRENCY}" +command = nice -n 18 /bin/bash -c "${MAYAN_BIN} celery --settings=${MAYAN_SETTINGS_MODULE} worker -Ofair -l ERROR -Q checkouts_periodic,documents_periodic,indexing,metadata,sources,sources_periodic,uploads,documents -n mayan-worker-medium.%%h ${MAYAN_WORKER_MEDIUM_CONCURRENCY}" killasgroup = true numprocs = 1 priority = 998 @@ -52,7 +52,7 @@ user = mayan [program:mayan-worker-slow] autorestart = false autostart = true -command = nice -n 19 /bin/bash -c "${MAYAN_BIN} celery --settings=${MAYAN_SETTINGS_MODULE} worker -Ofair -l ERROR -Q mailing,tools,statistics,parsing,ocr -n mayan-worker-slow.%%h ${MAYAN_WORKERS_SLOW_CONCURRENCY}" +command = nice -n 19 /bin/bash -c "${MAYAN_BIN} celery --settings=${MAYAN_SETTINGS_MODULE} worker -Ofair -l ERROR -Q mailing,tools,statistics,parsing,ocr -n mayan-worker-slow.%%h ${MAYAN_WORKER_SLOW_CONCURRENCY}" killasgroup = true numprocs = 1 priority = 998 From e2e89efb4793e91bb7c492e45770081c0f65203b Mon Sep 17 00:00:00 2001 From: Hamish Farroq Date: Sun, 14 Oct 2018 04:58:33 +0000 Subject: [PATCH 2/3] Fix the path to the SECRET_KEY --- docker/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 2932bddac6..2c76ba45d5 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -2,7 +2,7 @@ set -e echo "mayan: starting entrypoint.sh" -INSTALL_FLAG=/var/lib/mayan/media/system/SECRET_KEY +INSTALL_FLAG=/var/lib/mayan/system/SECRET_KEY CONCURRENCY_ARGUMENT=--concurrency= export DOCKER_ROOT=/opt/mayan-edms From 4efc3ec1822270d0d21c7ff1e2b167a5ebee4b2c Mon Sep 17 00:00:00 2001 From: Hamish Farroq Date: Sun, 14 Oct 2018 05:07:06 +0000 Subject: [PATCH 3/3] Add noop OCR driver. --- noopocr.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 noopocr.py diff --git a/noopocr.py b/noopocr.py new file mode 100644 index 0000000000..cd07f518ce --- /dev/null +++ b/noopocr.py @@ -0,0 +1,11 @@ +from __future__ import absolute_import, unicode_literals + +from ..classes import OCRBackendBase + + +class NoOpOCR(OCRBackendBase): + def __init__(self, *args, **kwargs): + super(NoOpOCR, self).__init__(*args, **kwargs) + + def execute(self, *args, **kwargs): + """Don't do anything"""