diff --git a/webservice/config/webservice.yaml b/webservice/config/webservice.yaml index ce6228b6eb8acafac98cfab1d22ca89b719f8990..c01d56424dd6e51fc62324545fc28bcdcd344c47 100644 --- a/webservice/config/webservice.yaml +++ b/webservice/config/webservice.yaml @@ -23,11 +23,14 @@ metadata-client: base-api-url: "https://in.xfel.eu/metadata/api/" kafka: - brokers: - - it-kafka-broker01.desy.de - - it-kafka-broker02.desy.de - - it-kafka-broker03.desy.de - topic: xfel-test-offline-cal + producer-config: + bootstrap-servers: + - "exflwgs06.desy.de" + security_protocol: "SASL_PLAINTEXT" + sasl_mechanism: "PLAIN" + sasl_plain_username: "cal" + # sasl_plain_password: # Configure per-user + topic: cal.offline-corrections correct: in-folder: /gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/raw diff --git a/webservice/job_monitor.py b/webservice/job_monitor.py index d30ed8230ea62c527db01351f4d5c50a14834ddf..7ac62c4e57ae96b49a07f4a4c381ac5aa060e831 100644 --- a/webservice/job_monitor.py +++ b/webservice/job_monitor.py @@ -44,9 +44,9 @@ class NoOpProducer: def init_kafka_producer(config): try: return KafkaProducer( - bootstrap_servers=config['kafka']['brokers'], value_serializer=lambda d: json.dumps(d).encode('utf-8'), max_block_ms=2000, # Don't get stuck trying to send Kafka messages + **config['kafka']['producer-config'] ) except KafkaError: log.warning("Problem initialising Kafka producer; "