robot0nfire/fl0w-old
robot0nfire/fl0w-old
Archived
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Migrated to new config framework

Browse source
This commit is contained in:
Philip Trauner 2016-02-27 12:41:24 +01:00
parent 56136ad5d2
commit e8cb00f8bd
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Server/Server.py
View file

@ -1,10 +1,12 @@
import Logging import Logging
import Routing import Routing
import Config
from .AsyncServer import Server from .AsyncServer import Server
from .Broadcast import Broadcast from .Broadcast import Broadcast
from time import strftime from time import strftime
from time import time
class Info(Routing.ServerRoute): class Info(Routing.ServerRoute):
def setup(self): def setup(self):
@ -65,6 +67,7 @@ class Handler(Server.Handler):
self.routes = Routing.create_routes(routes) self.routes = Routing.create_routes(routes)
self.broadcast = broadcast self.broadcast = broadcast
self.channel = None self.channel = None
self.start_time = time()
def handle(self, data, route): def handle(self, data, route):
@ -80,7 +83,19 @@ class Handler(Server.Handler):
Logging.info("'%s:%d' disconnected." % (self.sock.address, self.sock.port)) Logging.info("'%s:%d' disconnected." % (self.sock.address, self.sock.port))
server = Server(("172.20.10.3", 3077), debug=True) CONFIG_PATH = "server.cfg"
config = Config.Config()
config.add(Config.Option("server_address", ("127.0.0.1", 3077)))
config.add(Config.Option("debug", True, validator=lambda x: True if True or False else False))
try:
config = config.read_from_file(CONFIG_PATH)
except FileNotFoundError:
config.write_to_file(CONFIG_PATH)
config = config.read_from_file(CONFIG_PATH)
server = Server(config.server_address, debug=config.debug)
broadcast = Broadcast() broadcast = Broadcast()
# Populating broadcast channels with all channels defined in Handler.Channels # Populating broadcast channels with all channels defined in Handler.Channels