Skip to content
Snippets Groups Projects
Commit e3d6bba3 authored by Leszek Szymczak's avatar Leszek Szymczak
Browse files

Merge branch 'master' into 'morfeusz_to_docker'

# Conflicts:
#   Dockerfile
#   docker-compose.yml
#   src/morfeusz_worker.py
parents 8ed81f2b 062c8510
Branches
No related tags found
1 merge request!2Morfeusz to docker
Pipeline #1608 passed
[service] [service]
tool = morfeusz tool = morfeusz
rabbit_host = 10.17.0.85 rabbit_host = lexp_rabbitmq
rabbit_user = clarin rabbit_user = test
rabbit_password = clarin123 rabbit_password = test
queue_prefix=lex_
[tool] [tool]
workers_number = 1 workers_number = 1
......
version: '3' version: '3'
services: services:
stat: morfeusz:
container_name: clarin_morfeusz container_name: clarin_morfeusz
build: ./ build: ./
working_dir: /home/worker working_dir: /home/worker
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import json import json
import logging import logging
import lex_ws import lex_ws
import morfeusz2 import morfeusz2
...@@ -64,7 +65,7 @@ class MorfeuszWorker(lex_ws.LexWorker): ...@@ -64,7 +65,7 @@ class MorfeuszWorker(lex_ws.LexWorker):
responseb.append(list(elem[2])) responseb.append(list(elem[2]))
response = {'analyse': responseb} response = {'analyse': responseb}
elif function_type == 'getInfo': elif function_type == 'getInfo':
with open('info.json', 'rt', encoding='utf8') as f: with open('src/info.json', 'rt') as f:
response = json.load(f) response = json.load(f)
return response return response
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment