amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复media命令相关bug

Browse Source
This commit is contained in:
xiongziliang 2019-05-28 10:02:12 +08:00
parent 7e770841d1
commit 2f976214ce
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/Shell/ShellCMD.cpp → src/Shell/ShellCMD.h
View File

@ -45,31 +45,33 @@ public:
return;
}
if(ini.find("kick") != ini.end()){
//踢出源
do{
if(!media) {
break;
}
if(!media->close(true)) {
break;
}
(*stream) << "\t踢出成功:"
EventPollerPool::Instance().getPoller()->async([ini,media,stream,schema,vhost,app,streamid](){
if(ini.find("kick") != ini.end()){
//踢出源
do{
if(!media) {
break;
}
if(!media->close(true)) {
break;
}
(*stream) << "\t踢出成功:"
<< schema << "/"
<< vhost << "/"
<< app << "/"
<< streamid
<< "\r\n";
return;
}while(0);
(*stream) << "\t踢出失败:"
<< schema << "/"
<< vhost << "/"
<< app << "/"
<< streamid
<< "\r\n";
return;
}while(0);
(*stream) << "\t踢出失败:"
<< schema << "/"
<< vhost << "/"
<< app << "/"
<< streamid
<< "\r\n";
return;
}
}
},false);
});
}));
@ -86,11 +88,6 @@ public:
}
};
void installShellCMD(){
static onceToken s_token([]() {
REGIST_CMD(media);
}, nullptr);
}

8
src/Shell/ShellSession.cpp
View File

@ -25,18 +25,20 @@
*/
#include "ShellSession.h"
#include "Common/config.h"
#include "Util/CMD.h"
#include "Util/onceToken.h"
#include "Util/NoticeCenter.h"
#include "Common/config.h"
#include "ShellCMD.h"
using namespace toolkit;
namespace mediakit {
extern void installShellCMD();
static onceToken s_token([]() {
REGIST_CMD(media);
}, nullptr);
ShellSession::ShellSession(const Socket::Ptr &_sock) : TcpSession(_sock) {
installShellCMD();
pleaseInputUser();
}