Skip to content

Commit 9fb8644

Browse files
committed
added:test start supported
1 parent 87d061a commit 9fb8644

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Configure.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ bool XEngine_Configure_Parament(int argc, char** argv)
4242
{
4343
st_ServiceConfig.bDebug = true;
4444
}
45+
else if (0 == _tcsxcmp("-t", argv[i]))
46+
{
47+
bIsTest = true;
48+
}
4549
}
4650

4751
return true;

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_Hdr.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ using namespace std;
100100
// History:
101101
*********************************************************************/
102102
extern bool bIsRun;
103+
extern bool bIsTest;
103104
extern XHANDLE xhLog;
104105
//HTTP服务器
105106
extern XHANDLE xhHttpSocket;

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.cpp

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// History:
1212
*********************************************************************/
1313
bool bIsRun = false;
14+
bool bIsTest = false;
1415
XHANDLE xhLog = NULL;
1516
//HTTP服务器
1617
XHANDLE xhHttpSocket = NULL;
@@ -148,6 +149,7 @@ int main(int argc, char** argv)
148149
WSAStartup(MAKEWORD(2, 2), &st_WSAData);
149150
#endif
150151
bIsRun = true;
152+
int nRet = 0;
151153
LPCXSTR lpszHTTPMime = _X("./XEngine_Config/HttpMime.types");
152154
LPCXSTR lpszHTTPCode = _X("./XEngine_Config/HttpCode.types");
153155
HELPCOMPONENTS_XLOG_CONFIGURE st_XLogConfig;
@@ -604,13 +606,26 @@ int main(int argc, char** argv)
604606

605607
while (true)
606608
{
609+
if (bIsTest)
610+
{
611+
nRet = 0;
612+
break;
613+
}
607614
std::this_thread::sleep_for(std::chrono::seconds(1));
608615
}
609616

610617
XENGINE_SERVICEAPP_EXIT:
611618
if (bIsRun)
612619
{
613-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("有服务启动失败,服务器退出..."));
620+
if (bIsTest && 0 == nRet)
621+
{
622+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("服务启动完毕,测试程序退出..."));
623+
}
624+
else
625+
{
626+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("有服务启动失败,服务器退出..."));
627+
}
628+
614629
bIsRun = false;
615630
//销毁网络
616631
NetCore_TCPXCore_DestroyEx(xhHttpSocket);
@@ -665,5 +680,5 @@ int main(int argc, char** argv)
665680
#ifdef _MSC_BUILD
666681
WSACleanup();
667682
#endif
668-
return 0;
683+
return nRet;
669684
}

0 commit comments

Comments
 (0)