diff --git a/gstlal-calibration/bin/gstlal_calibration_aggregator b/gstlal-calibration/bin/gstlal_calibration_aggregator index a5bf6a352e6f2f78f7a6e7f671fa7c06892b27db..e38df285e55fd8607d3c2200b45779860a20b43c 100755 --- a/gstlal-calibration/bin/gstlal_calibration_aggregator +++ b/gstlal-calibration/bin/gstlal_calibration_aggregator @@ -80,6 +80,10 @@ if __name__ == '__main__': Config = ConfigParser.ConfigParser() Config.read(options.config_file) MonitoringConfigs = ConfigSectionMap("MonitoringConfigurations") + CalibrationConfigs = ConfigSectionMap("CalibrationConfigurations") + OutputConfigs = ConfigSectionMap("OutputConfigurations") + + # Read in monitoring options kafka_server = MonitoringConfigs["kafkaserver"] influx_hostname = MonitoringConfigs["influxhostname"] influx_port = MonitoringConfigs["influxport"] @@ -89,8 +93,11 @@ if __name__ == '__main__': across_jobs = Config.getboolean("MonitoringConfigurations", "acrossjobs") data_type = MonitoringConfigs["datatype"] dump_period = float(MonitoringConfigs["dumpperiod"]) - topics = ['H1_latency', 'H1_statevector_bit_check'] - channel = 'H1_HOFT_TEST' + + # Read in ifo specific options + ifo = CalibrationConfigs["ifo"] + topics = ['%s_latency' % ifo, '%s_statevector_bit_check' % ifo] + channel = OutputConfigs["frametype"] statevector_tags = ['TDCFs_valid', 'monitor_on'] logging.basicConfig(level = logging.INFO, format = "%(asctime)s %(levelname)s:%(processName)s(%(process)d):%(funcName)s: %(message)s") diff --git a/gstlal-calibration/python/calibhandler.py b/gstlal-calibration/python/calibhandler.py index 4daaa187cf8311950b1bbe26e98fe661573e4f0b..1301db1e174122765756ac18fb60c07f421654a3 100644 --- a/gstlal-calibration/python/calibhandler.py +++ b/gstlal-calibration/python/calibhandler.py @@ -80,6 +80,7 @@ class Handler(simplehandler.Handler): key_serializer = lambda m: json.dumps(m).encode('utf-8'), value_serializer = lambda m: json.dumps(m).encode('utf-8'), ) + print("Kafka server established.") except errors.NoBrokersAvailable: self.producer = None print("No brokers available for kafka. Defaulting to not pushing to kafka.")