refact: telnet server timeout is server timeout

config/sample.engine-core.docker.ini

@@ -21,12 +21,12 @@ api_url_playlog="http://0.0.0.0:8008/api/v1/playlog"
 audio_playlist_folder="/var/audio/playlist"
 
 
-[telnet]
+[server]
 ##################################################################################################
+# server_timeout="16380"
 # telnet_server_enable="true"
 # telnet_server_host="0.0.0.0"
 # telnet_server_port="1234"
-# telnet_server_timeout="16380"
 
 
 [fallback]

config/sample.engine-core.ini

@@ -21,12 +21,12 @@ api_url_playlog="http://127.0.0.1:8008/api/v1/playlog"
 ; audio_playlist_folder="../audio/playlist"
 
 
-[telnet]
+[server]
 ##################################################################################################
+# server_timeout="16380"
 # telnet_server_enable="true"
 # telnet_server_host="127.0.0.1"
 # telnet_server_port="1234"
-# telnet_server_timeout="16380"
 
 
 [fallback]

sample.docker.env

@@ -21,11 +21,11 @@ AURA_ENGINE_FRAME_DURATION=
 AURA_ENGINE_FRAME_SIZE=
 AURA_ENGINE_API_URL_PLAYLOG=http://172.17.0.1:8008/api/v1/playlog
 
-# Telnet Settings
+# Server Settings
+AURA_ENGINE_SERVER_TIMEOUT=16380.
 AURA_ENGINE_TELNET_ENABLE=true
 AURA_ENGINE_TELNET_HOST=0.0.0.0
 AURA_ENGINE_TELNET_PORT=1234
-AURA_ENGINE_TELNET_SERVER_TIMEOUT=16380.
 
 # Stream Input Settings
 AURA_ENGINE_STREAM_INPUT_MAX_BUFFER=5.0

src/settings.liq

@@ -51,19 +51,20 @@ else
     settings.init.allow_root.set(false)
 end
 
-# TELNET SETTINGS
+# SERVER SETTINGS
+server_timeout = float_of_string(get_setting("16380.", "server_timeout", "AURA_ENGINE_SERVER_TIMEOUT"))
+settings.server.timeout.set(server_timeout)
+
 telnet_server_enable = get_setting("true", "telnet_server_enable", "AURA_ENGINE_TELNET_ENABLE")
 telnet_server_host = get_setting("127.0.0.1", "telnet_server_host", "AURA_ENGINE_TELNET_HOST")
 telnet_server_port = int_of_string(get_setting("1234", "telnet_server_port", "AURA_ENGINE_TELNET_PORT"))
-telnet_server_timeout = float_of_string(get_setting("16380.", "telnet_server_timeout", "AURA_ENGINE_TELNET_SERVER_TIMEOUT"))
 if telnet_server_enable != "true" then
     print("\tLiquidsoap Telnet Server: disabled")
     settings.server.telnet.set(false)
 else
-    print("\tLiquidsoap Telnet Server at #{telnet_server_host}:#{telnet_server_port} (#{telnet_server_timeout}s timeout)")
+    print("\tLiquidsoap Telnet Server at #{telnet_server_host}:#{telnet_server_port} (#{server_timeout}s timeout)")
     settings.server.telnet.bind_addr.set(telnet_server_host)
     settings.server.telnet.port.set(telnet_server_port)
-    settings.server.timeout.set(telnet_server_timeout)
     settings.server.telnet.set(true)
 end