From 0aaa434996d4790cf4ea5db8639f6610f873a089 Mon Sep 17 00:00:00 2001
From: George Sedov <george.sedov@desy.de>
Date: Fri, 21 Oct 2022 19:21:36 +0200
Subject: [PATCH] hopefully fix
---
.gitlab-ci.yml | 4 ++--
receiver/src/receiver_config.cpp | 10 ++--------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c670387ae..e0fe307e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,7 @@ build-services-linux-debug:
tags:
- kubernetes-executor
rules:
- - when: never
+ - when: always
artifacts:
paths:
- build
@@ -66,7 +66,7 @@ test-services-linux-debug:
tags:
- kubernetes-executor
rules:
- - when: never
+ - when: always
dependencies:
- build-services-linux-debug
artifacts:
diff --git a/receiver/src/receiver_config.cpp b/receiver/src/receiver_config.cpp
index 3c8adf371..6f2211dac 100644
--- a/receiver/src/receiver_config.cpp
+++ b/receiver/src/receiver_config.cpp
@@ -77,17 +77,11 @@ Error ReceiverConfigManager::ReadConfigFromFile(std::string file_name) {
hostname_ib += "-ib";
}
- config.dataserver.advertise_ib_uri = hostname_ib + ": ";
struct addrinfo *result;
if (getaddrinfo(hostname_ib.c_str(), NULL, NULL, &result) == 0) {
char addr_ib[INET_ADDRSTRLEN + 1];
- struct addrinfo *rp;
- for (rp = result; rp != NULL; rp = rp->ai_next) {
- inet_ntop(AF_INET, &((struct sockaddr_in *)rp->ai_addr)->sin_addr, addr_ib, INET_ADDRSTRLEN);
- config.dataserver.advertise_ib_uri += std::string {addr_ib} + " " + std::to_string(rp->ai_family) + " " + std::to_string(rp->ai_socktype) + " " + std::to_string(rp->ai_protocol) + ";";
- }
- //inet_ntop(AF_INET, &((struct sockaddr_in *)result->ai_addr)->sin_addr, addr_ib, INET_ADDRSTRLEN);
- //config.dataserver.advertise_ib_uri = std::string {addr_ib} + ":" + std::to_string(config.dataserver.listen_port);
+ inet_ntop(AF_INET, &((struct sockaddr_in *)result->ai_addr)->sin_addr, addr_ib, INET_ADDRSTRLEN);
+ config.dataserver.advertise_ib_uri = std::string {addr_ib} + ":" + std::to_string(config.dataserver.listen_port);
freeaddrinfo(result);
}
--
GitLab