From 90790bd8e06d583fd85f832b3239e34c38bf0cb1 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 4 Mar 2024 15:50:08 +0100 Subject: [PATCH] support different server ports --- gui/src/components/main_startup_check.vue | 2 ++ modem/config.ini.example | 1 + modem/config.py | 1 + modem/server.py | 11 ++++++++++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gui/src/components/main_startup_check.vue b/gui/src/components/main_startup_check.vue index e9d3b238..c79139ad 100644 --- a/gui/src/components/main_startup_check.vue +++ b/gui/src/components/main_startup_check.vue @@ -126,6 +126,7 @@ function testHamlib() { max="65534" min="1025" v-model="settings.local.port" + @change="onChange" /> @@ -137,6 +138,7 @@ function testHamlib() { placeholder="modem host (default 127.0.0.1)" id="modem_port" v-model="settings.local.host" + @change="onChange" /> diff --git a/modem/config.ini.example b/modem/config.ini.example index 9897b0ab..42146b30 100644 --- a/modem/config.ini.example +++ b/modem/config.ini.example @@ -1,4 +1,5 @@ [NETWORK] +modemaddress = 127.0.0.1 modemport = 5000 [STATION] diff --git a/modem/config.py b/modem/config.py index 3137d411..57bfcdd5 100644 --- a/modem/config.py +++ b/modem/config.py @@ -10,6 +10,7 @@ class CONFIG: config_types = { 'NETWORK': { + 'modemaddress': str, 'modemport': int, }, 'STATION': { diff --git a/modem/server.py b/modem/server.py index 87bd73e8..cba71cf4 100644 --- a/modem/server.py +++ b/modem/server.py @@ -344,4 +344,13 @@ if __name__ == "__main__": # initialize database default values DatabaseManager(app.event_manager).initialize_default_values() wsm.startThreads(app) - app.run() + + conf = app.config_manager.read() + modemaddress = conf['NETWORK']['modemaddress'] + modemport = conf['NETWORK']['modemport'] + + if not modemaddress: + modemaddress = '127.0.0.1' + if not modemport: + modemport = 5000 + app.run(modemaddress, modemport)