chg: [D4Server] add server port in config

D4-project · Mar 31, 2021 · 39d5933 · 39d5933
1 parent cbb90c0
commit 39d5933
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/server/configs/server.conf.sample b/server/configs/server.conf.sample
@@ -4,6 +4,7 @@ use_default_save_directory = yes
 save_directory = None
 
 [D4_Server]
+server_port=4443
 # registration or shared-secret
 server_mode = registration
 default_hmac_key = private key to change

diff --git a/server/server.py b/server/server.py
@@ -13,6 +13,8 @@
 import logging
 import logging.handlers
 
+import configparser
+
 from twisted.internet import ssl, task, protocol, endpoints, defer
 from twisted.python import log
 from twisted.python.modules import getModule
@@ -45,8 +47,16 @@
 redis_server_metadata = config_loader.get_redis_conn("Redis_METADATA", decode_responses=False)
 
 # get server_mode
+try:
+    D4server_port = config_loader.get_config_int("D4_Server", "server_port")
+except configparser.NoOptionError:
+    D4server_port = 4443
+
 server_mode = config_loader.get_config_str("D4_Server", "server_mode")
-hmac_key = config_loader.get_config_str("D4_Server", "default_hmac_key")
+try:
+    hmac_key = config_loader.get_config_str("D4_Server", "default_hmac_key")
+except configparser.NoOptionError:
+    hmac_key = 'private key to change'
 
 config_loader = None
 ###  ###
@@ -555,7 +565,7 @@ def main(reactor):
     certificate = ssl.PrivateCertificate.loadPEM(certData)
     factory = protocol.Factory.forProtocol(D4_Server)
     # use interface to support both IPv4 and IPv6
-    reactor.listenSSL(4443, factory, certificate.options(), interface='::')
+    reactor.listenSSL(D4server_port, factory, certificate.options(), interface='::')
     return defer.Deferred()