implement new router system in server

This commit is contained in:
Bastian Schroll 2019-03-02 09:17:20 +01:00
parent 3fa10911c9
commit 39d88f3e3d
4 changed files with 53 additions and 32 deletions

View file

@ -52,6 +52,7 @@ try:
from boswatch.packet import Packet
from boswatch.utils import header
from boswatch.network.broadcast import BroadcastServer
from boswatch.router import RouterManager
except: # pragma: no cover
logging.exception("cannot import module")
exit(1)
@ -59,7 +60,6 @@ except: # pragma: no cover
try:
header.logoToLog()
header.infoToLog()
header.logoToScreen()
logging.debug("parse args")
# With -h or --help you get the Args help
@ -80,7 +80,10 @@ except: # pragma: no cover
logging.exception("error occurred")
exit(1)
import router_test
bwRoutMan = RouterManager()
bwRoutMan.buildRouter(bwConfig)
# ############################# begin server system
try:
@ -105,9 +108,10 @@ try:
bwPacket = Packet((data[1]))
bwPacket.set("clientIP", data[0])
bwPacket.addServerData()
bwPacket.addServerData(bwConfig)
# todo implement routing
bwRoutMan.runRouter(bwConfig.get("alarmRouter"), bwPacket)
incomingQueue.task_done()