shell登录鉴权改成广播方式

删除rtsp/rtmp shell命令,添加media命令
加载配置文件后发送广播
This commit is contained in:
xiongziliang
2018-02-08 17:24:42 +08:00
parent 3c40f171c1
commit 551b9a437b
8 changed files with 190 additions and 91 deletions

View File

@@ -24,6 +24,7 @@
* SOFTWARE.
*/
#include <Util/NoticeCenter.h>
#include "Common/config.h"
#include "Util/util.h"
#include "Util/onceToken.h"
@@ -33,12 +34,20 @@ using namespace ZL::Network;
namespace Config {
void loadIniConfig(){
auto &ini = ZL::Util::mINI::Instance();
bool loadIniConfig(const char *ini_path){
string ini;
if(ini_path){
ini = ini_path;
}else{
ini = exePath() + ".ini";
}
try{
ini.parseFile(exePath() + ".ini");
mINI::Instance().parseFile(ini);
NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastUpdateConfig);
return true;
}catch (std::exception &ex) {
ini.dumpFile(exePath() + ".ini");
mINI::Instance().dumpFile(ini);
return false;
}
}
////////////广播名称///////////
@@ -51,7 +60,11 @@ const char kBroadcastOnRtspAuth[] = "kBroadcastOnRtspAuth";
const char kBroadcastMediaPlayed[] = "kBroadcastMediaPlayed";
const char kBroadcastRtmpPublish[] = "kBroadcastRtmpPublish";
const char kBroadcastFlowReport[] = "kBroadcastFlowReport";
const char kFlowThreshold[] = "Broadcast.flowThreshold";
const char kBroadcastUpdateConfig[] = "kBroadcastUpdateConfig";
const char kBroadcastShellLogin[] = "kBroadcastShellLogin";
const char kFlowThreshold[] = "broadcast.flowThreshold";
onceToken token([](){
mINI::Instance()[kFlowThreshold] = 1024;
},nullptr);