Commit 77e18ead authored by BODERE's avatar BODERE
Browse files

Merge branch 'hotfix_6.0.10' into 'master'

Fix installation procedure & code cleaning

See merge request downloader/downloader_daemon!39
parents c3b7efb6 26925aa4
......@@ -35,6 +35,13 @@ conda activate downloader
# Install the downloader
./setup.py install
```
## PostgreSQL
```
sudo -u postgres createuser --interactive downloader_daemon
sudo -u postgres createdb -U downloader_daemon downloader_db
sudo -u postgres createdb -U downloader_daemon downloader_bfi
```
### Conda link issues
......@@ -79,4 +86,4 @@ There are also plugins for many editors and IDEs.
```
pytest lib/
```
\ No newline at end of file
```
name: downloader
channels:
- defaults
- default
- conda-forge
dependencies:
- python>=2.7
- gcc
- eccodes
# - gcc
......@@ -4,7 +4,6 @@ import logging
from .api.messages import EnhancedFileWriter, IMessageWriter
from .targets.EMMElastic import EMMElastic
from .targets.EMMRabbitMQ import EMMRabbitMQ
from downloader.scheduler.com.ext.PublishRabbitMQ import PublishRabbitMQ
......
......@@ -4,6 +4,7 @@
import logging
import os
import sys
import threading
from xml.parsers.expat import ExpatError
from xml.etree.ElementTree import ParseError
......@@ -36,7 +37,6 @@ class ReLoader(object):
self.__globalConfig = None
self.__database = None
self.log = logging.getLogger(LOGGER_NAME)
self.__verbose = False
self.__lockfileExtension = ".lock"
......
......@@ -44,7 +44,6 @@ from downloader.scheduler.sc.ProviderManager import ProviderManager
from downloader.scheduler.sc.ConfigurationFileUtil import ConfigurationFileUtil
from downloader.emm.EMMWriter import EMMWriter
from downloader.scheduler.sc.job_targets.JobsElastic import JobsElastic
from downloader.scheduler.sc.job_targets.JobsRabbitMQ import JobsRabbitMQ
from downloader.scheduler.com.ext.PublishRabbitMQ import PublishRabbitMQ
......
......@@ -9,7 +9,6 @@ from downloader.scheduler.sc.JobState import JobState
from downloader.scheduler.sc import Controller
from downloader.scheduler.sc.job_targets.JobsElastic import JobsElastic
from downloader.scheduler.sc.job_targets.JobsRabbitMQ import JobsRabbitMQ
from downloader.scheduler.com.ext.PublishRabbitMQ import PublishRabbitMQ
......
......@@ -19,7 +19,8 @@ import sys
from string import capwords
from downloader.scheduler.sc.job_targets.JobsElastic import JobsElastic
from downloader.scheduler.sc.job_targets.JobsRabbitMQ import JobsRabbitMQ
from downloader.scheduler.com.ext.PublishRabbitMQ import PublishRabbitMQ
STATE_INIT = "Initializing"
......@@ -103,7 +104,7 @@ class SynchronisationLocalRemote(object):
self.__log.debug("Jobs will be pushed to ElasticSearch")
# Setup RabbitMQ job upload
if "rabbitmq" in self.__globalConfig["jobs.targets"]:
self.__jobsRabbitMQ = JobsRabbitMQ(
self.__jobsRabbitMQ = PublishRabbitMQ(
host=self.__globalConfig["jobs.rabbitmq.host"],
port=self.__globalConfig["jobs.rabbitmq.port"],
ssl=self.__globalConfig["jobs.rabbitmq.ssl"],
......
......@@ -10,3 +10,4 @@ pika~=1.1.0
elasticsearch~=6.4
urllib3<=1.24.3
eccodes-python~=0.9.7
numpy~=1.18
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment