mirror of
https://github.com/BOSWatch/BW3-Core.git
synced 2025-12-06 07:12:04 +01:00
fix some not defined warnings
This commit is contained in:
parent
bb1a7f21f9
commit
543719a917
|
|
@ -68,6 +68,9 @@ if not bwConfig.loadConfigFile(paths.CONFIG_PATH + args.config):
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
# ========== CLIENT CODE ==========
|
# ========== CLIENT CODE ==========
|
||||||
|
mmThread = None
|
||||||
|
bwClient = None
|
||||||
|
|
||||||
try:
|
try:
|
||||||
ip = bwConfig.get("server", "ip", default="127.0.0.1")
|
ip = bwConfig.get("server", "ip", default="127.0.0.1")
|
||||||
port = bwConfig.get("server", "port", default="8080")
|
port = bwConfig.get("server", "port", default="8080")
|
||||||
|
|
@ -198,7 +201,9 @@ except: # pragma: no cover
|
||||||
logging.exception("BOSWatch interrupted by an error")
|
logging.exception("BOSWatch interrupted by an error")
|
||||||
finally:
|
finally:
|
||||||
logging.debug("Starting shutdown routine")
|
logging.debug("Starting shutdown routine")
|
||||||
bwClient.disconnect()
|
if bwClient:
|
||||||
|
bwClient.disconnect()
|
||||||
inputThreadRunning = False
|
inputThreadRunning = False
|
||||||
mmThread.join()
|
if mmThread:
|
||||||
|
mmThread.join()
|
||||||
logging.debug("BOSWatch client has stopped ...")
|
logging.debug("BOSWatch client has stopped ...")
|
||||||
|
|
|
||||||
15
bw_server.py
15
bw_server.py
|
|
@ -46,7 +46,6 @@ from boswatch.network.broadcast import BroadcastServer
|
||||||
from boswatch.router.routerManager import RouterManager
|
from boswatch.router.routerManager import RouterManager
|
||||||
from boswatch.utils import misc
|
from boswatch.utils import misc
|
||||||
|
|
||||||
|
|
||||||
header.logoToLog()
|
header.logoToLog()
|
||||||
header.infoToLog()
|
header.infoToLog()
|
||||||
|
|
||||||
|
|
@ -67,8 +66,11 @@ if not bwConfig.loadConfigFile(paths.CONFIG_PATH + args.config):
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
# ############################# begin server system
|
# ############################# begin server system
|
||||||
try:
|
bwRoutMan = None
|
||||||
|
bwServer = None
|
||||||
|
bcServer = None
|
||||||
|
|
||||||
|
try:
|
||||||
bwRoutMan = RouterManager()
|
bwRoutMan = RouterManager()
|
||||||
if not bwRoutMan.buildRouter(bwConfig):
|
if not bwRoutMan.buildRouter(bwConfig):
|
||||||
logging.fatal("Error while building routers")
|
logging.fatal("Error while building routers")
|
||||||
|
|
@ -109,7 +111,10 @@ except: # pragma: no cover
|
||||||
logging.exception("BOSWatch interrupted by an error")
|
logging.exception("BOSWatch interrupted by an error")
|
||||||
finally:
|
finally:
|
||||||
logging.debug("Starting shutdown routine")
|
logging.debug("Starting shutdown routine")
|
||||||
del bwRoutMan
|
if bwRoutMan:
|
||||||
bwServer.stop()
|
del bwRoutMan
|
||||||
bcServer.stop()
|
if bwServer:
|
||||||
|
bwServer.stop()
|
||||||
|
if bcServer:
|
||||||
|
bcServer.stop()
|
||||||
logging.debug("BOSWatch server has stopped ...")
|
logging.debug("BOSWatch server has stopped ...")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue