From 6fba35f91a4011fde17c9976b386c71f756b3a3d Mon Sep 17 00:00:00 2001 From: "limin.zhang" Date: Tue, 14 Feb 2023 14:55:15 +0800 Subject: [PATCH] =?UTF-8?q?2023.02.14=20=E8=AF=95=E5=9B=BE=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8Live=20Streaming?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9A=E8=B0=83=E6=95=B4master?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=9A=84IP=EF=BC=8C=E4=BB=8E127.0.0.1?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=86=85=E7=BD=91IP=E3=80=82=E4=BB=8E?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E5=90=8C=E6=AD=A5=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/fms-core/wtest_actor.conf | 2 +- config/fms-core/wtest_core.conf | 21 ++++++---- config/fms-master/logback.xml | 62 ++++++++++++++++++++++++----- config/fms-master/master1.conf | 6 +-- config/fms-notification/config.yaml | 2 +- 5 files changed, 69 insertions(+), 24 deletions(-) diff --git a/config/fms-core/wtest_actor.conf b/config/fms-core/wtest_actor.conf index 05dd3a5..9063644 100644 --- a/config/fms-core/wtest_actor.conf +++ b/config/fms-core/wtest_actor.conf @@ -7,7 +7,7 @@ play.akka.actor-system = "mkfleet-4g-actor-system" akka { remote.netty.tcp.port=45000 - remote.netty.tcp.hostname="172.20.24.171" + remote.netty.tcp.hostname=172.20.24.171 remote.netty.tcp.bind-port=45000 remote.netty.tcp.bind-hostname=0.0.0.0 diff --git a/config/fms-core/wtest_core.conf b/config/fms-core/wtest_core.conf index db5fd37..48c044e 100644 --- a/config/fms-core/wtest_core.conf +++ b/config/fms-core/wtest_core.conf @@ -39,6 +39,7 @@ logger.play = INFO # Logger provided to your application: logger.application = DEBUG + # WS play.ws.timeout { connection = 6s // evolutions.evolutions is 120 @@ -128,8 +129,8 @@ kafka.server.address="172.20.24.171:9092" kafka.gps.topic=fleet-api-gps kafka.notification.topic=fleet-api-notification -# fms_gps Server (waylens-fms-gps) -fms_gps.server.address = "http://172.20.24.171:9004" +# fms_gps Server (waylens-fms-clip) +fms_gps.server.address = "http://100.66.240.213:9004" # notification push server (waylens-fms-notification) provider.waylens.notificationPusher.endpoint="http://172.20.24.171:8060/fmsKafka" @@ -194,16 +195,16 @@ provider.aws { # Wowza parameters provider.wowza { - defaultPublishServer = "rtmp://54.255.235.62" + defaultPublishServer = "rtmp://13.229.12.162" appName = "live_fleet" - publishUsername = "publisher" - publishPassword = "rnxnTbcpJWwTVY0L" + publishUsername = "publishfleet" + publishPassword = "E54d22d793" playSecret = "Sh4Tgsl2l43lB" playParam = "fleet" playProtocol = "rtmp" playProtocolCN = "rtmp" audio{ - host="54.255.235.62" + host="13.229.12.162" port=1935 appName="live_audio", publishUsername = "fleet_audio" @@ -211,11 +212,15 @@ provider.wowza { } privateIPMap { #"18.116.56.97": "172.31.34.99" - "54.255.235.62": "172.20.24.171" } domainMap { - "172.20.24.171": "54.255.235.62" + #"172.31.9.208" : "13.229.12.162" + #"172.31.9.208": "616e881f8f6db.streamlock.net" + #"13.229.12.162": "616e881f8f6db.streamlock.net" + #"172.31.9.208": "619c7e3c4e66c.streamlock.net" + #"13.229.12.162": "619c7e3c4e66c.streamlock.net" + "172.31.9.208": "13.229.12.162" } } diff --git a/config/fms-master/logback.xml b/config/fms-master/logback.xml index b449010..bf0e726 100644 --- a/config/fms-master/logback.xml +++ b/config/fms-master/logback.xml @@ -1,24 +1,64 @@ - - - - ${log.txtfile}_%d{yyyy-MM-dd}.log - - + + + - - %coloredLevel %logger{128} %d{yyyy-MM-dd HH:mm:ss.SSSXXX, UTC} %message%n%xException{5} + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}][%-5level][%logger{128}][%thread] %message%n%xException{5} + + + + + + ${log.txtfile}_%d{yyyy-MM-dd}.log + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}][%-5level][%logger{128}][%thread] %message%n%xException{5} - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/fms-master/master1.conf b/config/fms-master/master1.conf index d3aaba1..72e5f3d 100644 --- a/config/fms-master/master1.conf +++ b/config/fms-master/master1.conf @@ -5,7 +5,7 @@ akka { remote { netty { tcp { - hostname = 127.0.0.1 + hostname = 172.20.24.171 port = 2551 } } @@ -13,8 +13,8 @@ akka { cluster { seed-nodes = [ - "akka.tcp://ClusterSystem@127.0.0.1:2551", - "akka.tcp://ClusterSystem@127.0.0.1:2552"] + "akka.tcp://ClusterSystem@172.20.24.171:2551", + "akka.tcp://ClusterSystem@172.20.24.171:2552"] # auto-down-unreachable-after = 10s } diff --git a/config/fms-notification/config.yaml b/config/fms-notification/config.yaml index c6ea6da..6ae2ba9 100644 --- a/config/fms-notification/config.yaml +++ b/config/fms-notification/config.yaml @@ -20,7 +20,7 @@ kafka: commitInterval: gps: 1000 general: 0 - version: 2.6.3 + version: 2.6.3 aws: config: