afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

reverted enclosing system start in exception handler

Browse source
This commit is contained in:
Blake Harnden 2019-06-06 11:43:39 -07:00
parent e59a8bf66d
commit 0b770d8350
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
daemon/scripts/core-daemon
View file

@ -65,19 +65,19 @@ def cored(cfg, use_ovs):
if use_ovs: if use_ovs:
from core.netns.openvswitch import OVS_NODES from core.netns.openvswitch import OVS_NODES
server.coreemu.update_nodes(OVS_NODES) server.coreemu.update_nodes(OVS_NODES)
# start udp server
start_udp(server, address)
# close handlers
close_onexec(server.fileno())
logging.info("tcp/udp servers started, listening on: %s:%s", host, port)
server.serve_forever()
except: except:
logging.exception("error starting main server on: %s:%s", host, port) logging.exception("error starting main server on: %s:%s", host, port)
sys.exit(1) sys.exit(1)
# start udp server
start_udp(server, address)
# close handlers
close_onexec(server.fileno())
logging.info("tcp/udp servers started, listening on: %s:%s", host, port)
server.serve_forever()
def get_merged_config(filename): def get_merged_config(filename):
""" """