diff --git a/bin/aapp_dr_runner.py b/bin/aapp_dr_runner.py index 7d7f31f..0ff470b 100755 --- a/bin/aapp_dr_runner.py +++ b/bin/aapp_dr_runner.py @@ -760,6 +760,8 @@ def publish_level1(publisher, config, msg, filelist, station_name, environment): log_config = args.log_config verbose = args.verbose nameservers = args.nameservers + if nameservers and 'false' in nameservers: + nameservers = False publish_port = args.publish_port if not os.path.isfile(config_filename): @@ -793,9 +795,13 @@ def publish_level1(publisher, config, msg, filelist, station_name, environment): LOG.debug('Subscribe: {services} {topics}'.format(services=services, topics=aapp_config.get_parameter('subscribe_topics'))) - with posttroll.subscriber.Subscribe(services, - aapp_config.get_parameter('subscribe_topics'), - True) as subscr: + with posttroll.subscriber.Subscribe( + services, + topics=aapp_config.get_parameter('subscribe_topics'), + addr_listener=True, + addresses=aapp_config.get('addresses', None), + nameserver=aapp_config.get('subscribe_nameserver', 'localhost'), + ) as subscr: with Publish('aapp_runner', port=publish_port, nameservers=nameservers) as publisher: while True: diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml index d4f6727..0ff09c8 100644 --- a/continuous_integration/environment.yaml +++ b/continuous_integration/environment.yaml @@ -14,6 +14,7 @@ dependencies: - pytest-cov - setuptools_scm - pip + - git - pip: - trollsift - posttroll diff --git a/examples/aapp-processing.yaml-template b/examples/aapp-processing.yaml-template index a19924a..99c4cc1 100644 --- a/examples/aapp-processing.yaml-template +++ b/examples/aapp-processing.yaml-template @@ -18,7 +18,7 @@ aapp_static_configuration: avhrr_file: hrpt.l1b msu_file: msun.l1b - # Valid NOAA(POES)satellite names to process + # Valid NOAA (POES) satellite names to process supported_noaa_satellites: - NOAA-15 - NOAA-18 @@ -93,6 +93,12 @@ aapp_processes: subscribe_topics: - /XLBANDANTENNA/HRPT/L0 - /XLBANDANTENNA/METOP/L0 + # Additional settings for subscriber to disable nameserver connection and use + # direct connections instead + # addresses: + # - tcp://first_address:12345 + # - tcp://second_address:67891 + # subscribe_nameserver: False # Base dir of the TLE files for AAPP. Will override the (AAPP) environment variable DIR_DATA_TLE tle_indir: /base/dir/under/which/aapp/expects/the/tle/files