Use getfqdn instead of gethostname
We need routable addresses for streaming, so make sure we use the fqdn. Change-Id: I43cca352eb123bb484e3d51aa242ba4258c1d51e
This commit is contained in:
parent
0a64a92e9e
commit
ce1bf1f34f
|
@ -1600,7 +1600,7 @@ class ExecutorServer(object):
|
||||||
# TODOv3(mordred): make the executor name more unique --
|
# TODOv3(mordred): make the executor name more unique --
|
||||||
# perhaps hostname+pid.
|
# perhaps hostname+pid.
|
||||||
self.hostname = get_default(self.config, 'executor', 'hostname',
|
self.hostname = get_default(self.config, 'executor', 'hostname',
|
||||||
socket.gethostname())
|
socket.getfqdn())
|
||||||
self.log_streaming_port = log_streaming_port
|
self.log_streaming_port = log_streaming_port
|
||||||
self.merger_lock = threading.Lock()
|
self.merger_lock = threading.Lock()
|
||||||
self.governor_lock = threading.Lock()
|
self.governor_lock = threading.Lock()
|
||||||
|
|
|
@ -214,7 +214,7 @@ class Scheduler(threading.Thread):
|
||||||
def __init__(self, config, testonly=False):
|
def __init__(self, config, testonly=False):
|
||||||
threading.Thread.__init__(self)
|
threading.Thread.__init__(self)
|
||||||
self.daemon = True
|
self.daemon = True
|
||||||
self.hostname = socket.gethostname()
|
self.hostname = socket.getfqdn()
|
||||||
self.wake_event = threading.Event()
|
self.wake_event = threading.Event()
|
||||||
self.layout_lock = threading.Lock()
|
self.layout_lock = threading.Lock()
|
||||||
self.run_handler_lock = threading.Lock()
|
self.run_handler_lock = threading.Lock()
|
||||||
|
|
Loading…
Reference in New Issue