mirror of
https://github.com/CopterExpress/clever-show.git
synced 2026-05-26 23:19:33 +00:00
Minor config changes (added ability to turn off broadcast)
This commit is contained in:
@@ -65,17 +65,22 @@ class Server:
|
||||
def load_config(self):
|
||||
self.config.read(self.config_path)
|
||||
self.port = int(self.config['SERVER']['port']) # TODO try, init def
|
||||
self.broadcast_port = int(self.config['SERVER']['broadcast_port'])
|
||||
self.BROADCAST_DELAY = int(self.config['SERVER']['broadcast_delay'])
|
||||
Server.BUFFER_SIZE = int(self.config['SERVER']['buffer_size'])
|
||||
|
||||
self.use_broadcast = self.config.getboolean('BROADCAST', 'use_broadcast')
|
||||
self.broadcast_port = int(self.config['BROADCAST']['broadcast_port'])
|
||||
self.BROADCAST_DELAY = int(self.config['BROADCAST']['broadcast_delay'])
|
||||
|
||||
self.USE_NTP = self.config.getboolean('NTP', 'use_ntp')
|
||||
self.NTP_HOST = self.config['NTP']['host']
|
||||
self.NTP_PORT = int(self.config['NTP']['port'])
|
||||
|
||||
def start(self): # do_auto_connect=True, do_ip_broadcast=True, do_listen_broadcast=False
|
||||
def start(self, do_ip_broadcast=None): # do_auto_connect=True, , do_listen_broadcast=False
|
||||
self.time_started = time.time()
|
||||
|
||||
if do_ip_broadcast is None:
|
||||
do_ip_broadcast = self.use_broadcast
|
||||
|
||||
logging.info("Starting server with id: {} on {}:{} !".format(self.id, self.ip, self.port))
|
||||
logging.info("Starting server socket!")
|
||||
self.server_socket.bind((self.ip, self.port))
|
||||
@@ -84,9 +89,10 @@ class Server:
|
||||
self.client_processor_thread_running.set()
|
||||
self.autoconnect_thread.start()
|
||||
|
||||
logging.info("Starting broadcast sender thread!")
|
||||
self.broadcast_thread_running.set()
|
||||
self.broadcast_thread.start()
|
||||
if do_ip_broadcast:
|
||||
logging.info("Starting broadcast sender thread!")
|
||||
self.broadcast_thread_running.set()
|
||||
self.broadcast_thread.start()
|
||||
|
||||
logging.info("Starting broadcast listener thread!")
|
||||
self.listener_thread_running.set()
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
[SERVER]
|
||||
port = 25000
|
||||
buffer_size = 1024
|
||||
|
||||
[BROADCAST]
|
||||
use_broadcast = True
|
||||
broadcast_port = 8181
|
||||
broadcast_delay = 5
|
||||
buffer_size = 1024
|
||||
|
||||
[NTP]
|
||||
use_ntp = False
|
||||
|
||||
Reference in New Issue
Block a user