Skip to content

Commit 5597ebc

Browse files
committed
modify:does not report info when debug start
1 parent 262b34b commit 5597ebc

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

XEngine_Release/XEngine_Config/XEngine_Config.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
},
3434
"RTMP": {
3535
"bEnable": true,
36-
"bPrePull": false
36+
"bPrePull": true
3737
},
3838
"FLV": {
3939
"bEnable": true,
40-
"bPrePull": false
40+
"bPrePull": true
4141
},
4242
"RTSP": {
4343
"bEnable": true,
@@ -76,10 +76,11 @@
7676
"LogFile": "./XEngine_XLog/XEngine_StreamMediaApp.Log",
7777
"MaxSize": 1024000,
7878
"MaxCount": 10,
79-
"LogLeave": 17
79+
"LogLeave": 17,
80+
"LogType": 32
8081
},
8182
"XReport":{
82-
"bEnable":false,
83+
"bEnable":true,
8384
"tszServiceName":"XEngine_StreamMedia",
8485
"tszAPIUrl":"http://app.xyry.org:5501/api?function=machine"
8586
}

XEngine_Release/XEngine_Config/XEngine_Version.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"XVer": [
3+
"V2.11.0.1001 Build20250409",
34
"V2.10.0.1001 Build20250124",
45
"V2.9.0.1001 Build20241011",
56
"V2.8.0.1001 Build20240531",

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ DEBUG =
2929
else
3030
ifeq ($(PLATFORM),mac)
3131
FLAGS = -c
32-
DEBUG = -g
32+
DEBUG = -g -D _DEBUG
3333
else
3434
FLAGS = -c -lc_p
35-
DEBUG = -g -pg
35+
DEBUG = -g -pg -D _DEBUG
3636
endif
3737
endif
3838

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,6 @@ int main(int argc, char** argv)
467467
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,启动JT1078处理线程池成功,线程个数:%d"), st_ServiceConfig.st_XMax.nJT1078Thread);
468468
}
469469
#if 1 == _XENGINE_STREAMMEDIA_BUILDSWITCH_SRT
470-
471470
if (!ModuleHelp_SrtCore_Init())
472471
{
473472
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中,初始化SRT服务失败,错误:%lX"), ModuleHelp_GetLastError());
@@ -534,7 +533,7 @@ int main(int argc, char** argv)
534533
#else
535534
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中,SRTP协议编译选项被禁用,无法使用SRTP协议"));
536535
#endif
537-
536+
538537
if (st_ServiceConfig.st_XPull.st_PullRtsp.bEnable)
539538
{
540539
xhVRTPSocket = NetCore_UDPXCore_StartEx(st_ServiceConfig.st_XPull.st_PullRtsp.nVRTPPort, 1);
@@ -621,6 +620,7 @@ int main(int argc, char** argv)
621620
{
622621
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中,HLS(M3U8)文件流被设置为禁用"));
623622
}
623+
#ifdef _DEBUG
624624
//发送信息报告
625625
if (st_ServiceConfig.st_XReport.bEnable && !bIsTest)
626626
{
@@ -638,7 +638,7 @@ int main(int argc, char** argv)
638638
{
639639
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中,信息报告给API服务器没有启用"));
640640
}
641-
641+
#endif
642642

643643
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s,服务版本:%s,发行次数;%d。。。"), BaseLib_Version_XNumberStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());
644644

0 commit comments

Comments
 (0)