matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'versions/next' into 'versions/next'

Browse Source 
Versions/next

See merge request mayan-edms/mayan-edms!30

Closes GitLab issues #525 and #527
This commit is contained in:
Roberto Rosario
2018-10-14 05:15:21 +00:00
parent 7a4302415a 4efc3ec182
commit 665dbb6766
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/entrypoint.sh
View File

@@ -2,7 +2,7 @@
set -e set -e
echo "mayan: starting entrypoint.sh" 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= CONCURRENCY_ARGUMENT=--concurrency=
export DOCKER_ROOT=/opt/mayan-edms export DOCKER_ROOT=/opt/mayan-edms

6
docker/etc/supervisor/mayan.conf
View File

@@ -22,7 +22,7 @@ user = root
[program:mayan-worker-fast] [program:mayan-worker-fast]
autorestart = false autorestart = false
autostart = true 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 killasgroup = true
numprocs = 1 numprocs = 1
priority = 998 priority = 998
@@ -37,7 +37,7 @@ user = mayan
[program:mayan-worker-medium] [program:mayan-worker-medium]
autorestart = false autorestart = false
autostart = true 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 killasgroup = true
numprocs = 1 numprocs = 1
priority = 998 priority = 998
@@ -52,7 +52,7 @@ user = mayan
[program:mayan-worker-slow] [program:mayan-worker-slow]
autorestart = false autorestart = false
autostart = true 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 killasgroup = true
numprocs = 1 numprocs = 1
priority = 998 priority = 998

11
noopocr.py Normal file
View File

@@ -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"""