From 77b5e93d6fbaa2586ad6076150b6ef1122140dea Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 31 Oct 2016 09:38:21 -0400 Subject: [PATCH 1/2] Another try at portable fedmsg-relay dev config. --- fedmsg.d/module_build_service.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/fedmsg.d/module_build_service.py b/fedmsg.d/module_build_service.py index fdb2149d..aabbf2ba 100644 --- a/fedmsg.d/module_build_service.py +++ b/fedmsg.d/module_build_service.py @@ -1,3 +1,5 @@ +import socket + config = { # Just for dev. "validate_signatures": False, @@ -14,17 +16,7 @@ config = { #"tcp://hub.fedoraproject.org:9940", "tcp://stg.fedoraproject.org:9940", ], - "relay_outbound": [ - "tcp://fedmsg-relay:2001", - "tcp://127.0.0.1:4001", - ], }, - "relay_inbound": [ - # Try this first. (docker-compose) - "tcp://fedmsg-relay:2003", - # If it fails, then failover to this (modularity.fic.o) - "tcp://127.0.0.1:2003", - ], # Start of code signing configuration # 'sign_messages': True, @@ -43,3 +35,14 @@ config = { # } # End of code signing configuration } + +# Try to figure out if we're running inside a docker-compose container +fqdn = socket.getfqdn() +# If we are, then fqdn is something like '4c62a35c9f9c' +if fqdn.isalnum() and len(fqdn) == 12: + config['endpoints']['relay_outbound'] = ["tcp://fedmsg-relay:2001"] + config['relay_inbound'] = ["tcp://fedmsg-relay:2003"] +else: + # These configuration values are reasonable for most other configurations. + config['endpoints']['relay_outbound'] = ["tcp://127.0.0.1:4001"] + config['relay_inbound'] = ["tcp://127.0.0.1:2003"] From cb050b92c814ac677657f38c9126d1cc35fefe20 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 31 Oct 2016 10:47:50 -0400 Subject: [PATCH 2/2] Use a less hacky way to determine if we're running inside Docker. --- fedmsg.d/module_build_service.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fedmsg.d/module_build_service.py b/fedmsg.d/module_build_service.py index aabbf2ba..27d948d1 100644 --- a/fedmsg.d/module_build_service.py +++ b/fedmsg.d/module_build_service.py @@ -1,4 +1,4 @@ -import socket +import os config = { # Just for dev. @@ -37,9 +37,8 @@ config = { } # Try to figure out if we're running inside a docker-compose container -fqdn = socket.getfqdn() -# If we are, then fqdn is something like '4c62a35c9f9c' -if fqdn.isalnum() and len(fqdn) == 12: +# http://stackoverflow.com/questions/20010199 +if os.path.exists('/.dockerenv'): config['endpoints']['relay_outbound'] = ["tcp://fedmsg-relay:2001"] config['relay_inbound'] = ["tcp://fedmsg-relay:2003"] else: