From ccd96f676c6f64942589ce4edbcf69aad235a044 Mon Sep 17 00:00:00 2001 From: monktan Date: Tue, 17 Nov 2020 16:00:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=8F=98=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/main.cpp b/server/main.cpp index 43a9703a..1b7e6f41 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -220,7 +220,7 @@ int start_main(int argc,char *argv[]) { g_ini_file = cmd_main["config"]; string ssl_file = cmd_main["ssl"]; int threads = cmd_main["threads"]; - std::string mid = cmd_main["mserverid"]; + std::string msid = cmd_main["mserverid"]; //设置日志 Logger::Instance().add(std::make_shared("ConsoleChannel", logLevel)); @@ -247,8 +247,8 @@ int start_main(int argc,char *argv[]) { loadIniConfig(g_ini_file.data()); //如果自定义了mediaserverid,在这里覆盖配置文件 - if(!mid.empty()) { - mINI::Instance()[General::kMediaServerId] = mid; + if(!msid.empty()) { + mINI::Instance()[General::kMediaServerId] = msid; } if(!File::is_dir(ssl_file.data())){