|
|
@@ -66,9 +66,9 @@ namespace Chromium {
|
|
|
|
|
|
CChromiumEntity::CChromiumEntity() :m_pWsServer(NULL), m_iTcpBridgePort(4504), m_pTimerListener(NULL), m_strCustomMainUrl(true)
|
|
|
, m_runAd(false), m_runMain(false), m_runExtend(false), m_runLogin(false), m_withBrowser(false), m_withMin(false), m_withClose(false)
|
|
|
- , m_withDebugMode(false), m_withMagic(false), m_withNoFileLog(false), m_installMode(false)
|
|
|
+ , m_withDebugMode(false), m_withMagic(false), m_withNoFileLog(false), m_installMode(false), m_withMedia(false), m_withSpecialTest(false)
|
|
|
{
|
|
|
- DbgEx("CChromiumEntity constructor");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("CChromiumEntity constructor");
|
|
|
|
|
|
//boost::thread(boost::bind(&CChromiumEntity::CefClintNotify, this)).detach(); //后台自动运行
|
|
|
|
|
|
@@ -101,43 +101,43 @@ namespace Chromium {
|
|
|
if (CompKey == COMPKEY_JOBOBJECT) {
|
|
|
switch (dwBytesXferred) {
|
|
|
case JOB_OBJECT_MSG_END_OF_JOB_TIME:
|
|
|
- DbgEx("Job time limit reached");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Job time limit reached");
|
|
|
break;
|
|
|
|
|
|
case JOB_OBJECT_MSG_END_OF_PROCESS_TIME:
|
|
|
- DbgEx("Job process (Id=%d) time limit reached", po);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Job process (Id=%d) time limit reached", po);
|
|
|
break;
|
|
|
|
|
|
case JOB_OBJECT_MSG_ACTIVE_PROCESS_LIMIT:
|
|
|
- DbgEx("Too many active processes in job");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Too many active processes in job");
|
|
|
break;
|
|
|
|
|
|
case JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO:
|
|
|
- DbgEx("Job contains no active processes");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Job contains no active processes");
|
|
|
break;
|
|
|
|
|
|
case JOB_OBJECT_MSG_NEW_PROCESS:
|
|
|
- DbgEx("New process (Id=%d) in Job", po);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("New process (Id=%d) in Job", po);
|
|
|
break;
|
|
|
|
|
|
case JOB_OBJECT_MSG_EXIT_PROCESS:
|
|
|
- DbgEx("Process (Id=%d) terminated", po);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Process (Id=%d) terminated", po);
|
|
|
break;
|
|
|
|
|
|
case JOB_OBJECT_MSG_ABNORMAL_EXIT_PROCESS:
|
|
|
- DbgEx("Process (Id=%d) terminated abnormally", po);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Process (Id=%d) terminated abnormally", po);
|
|
|
break;
|
|
|
|
|
|
case JOB_OBJECT_MSG_PROCESS_MEMORY_LIMIT:
|
|
|
- DbgEx("Process (Id=%d) exceeded memory limit", po);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Process (Id=%d) exceeded memory limit", po);
|
|
|
break;
|
|
|
|
|
|
case JOB_OBJECT_MSG_JOB_MEMORY_LIMIT:
|
|
|
- DbgEx("Process (Id=%d) exceeded job memory limit", po);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Process (Id=%d) exceeded job memory limit", po);
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
- DbgEx("Unknown notification: %d", dwBytesXferred);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Unknown notification: %d", dwBytesXferred);
|
|
|
break;
|
|
|
}
|
|
|
CompKey = 1;
|
|
|
@@ -187,7 +187,7 @@ namespace Chromium {
|
|
|
return;
|
|
|
}
|
|
|
auto ret = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::OutsideRequest, std::make_tuple(strUrl.GetData(), strUrl2.GetData()));
|
|
|
- DbgEx("open OutsideRequest browser page %s return %d", (LPCTSTR)strUrl, ret.first);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("open OutsideRequest browser page %s return %d", (LPCTSTR)strUrl, ret.first);
|
|
|
ctx->Answer(ret.first);
|
|
|
}
|
|
|
else if (!strType.Compare((+ERR_PAGE_REASON::SpecialPageFromOtherEntity)._to_string(), true))
|
|
|
@@ -203,7 +203,7 @@ namespace Chromium {
|
|
|
auto ret = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::SpecialPageFromOtherEntity,
|
|
|
std::make_tuple(strUrl.GetData(), strUrl2.GetData()));
|
|
|
|
|
|
- DbgEx("open %s browser page %s return %d", dstBrowserName.GetData(), (LPCTSTR)strUrl, ret.first);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("open %s browser page %s return %d", dstBrowserName.GetData(), (LPCTSTR)strUrl, ret.first);
|
|
|
ctx->Answer(ret.first);
|
|
|
}
|
|
|
else
|
|
|
@@ -222,7 +222,7 @@ namespace Chromium {
|
|
|
auto profStr = CSimpleString::Format("chromiumAnalyze_%s.prof", generateTimeStr(true).c_str());
|
|
|
std::thread([](std::string str) {
|
|
|
ProfilerStart(str.c_str());//开启性能分析
|
|
|
- DbgEx("Generate chromiumAnalyze, %s", str.c_str());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Generate chromiumAnalyze, %s", str.c_str());
|
|
|
}, profStr.GetData()).detach();
|
|
|
#endif // OPEN_PERF
|
|
|
|
|
|
@@ -243,7 +243,7 @@ namespace Chromium {
|
|
|
{
|
|
|
if (SIGTERM == i)
|
|
|
signal(i, [](int signum)->void {
|
|
|
- DbgEx("receive signal:%d, closeChromium", signum);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("receive signal:%d, closeChromium", signum);
|
|
|
CModTools::get_mutable_instance().killAllChromiumByThread(3);
|
|
|
CWebsocketServer::stopServer();
|
|
|
signal(signum, SIG_DFL);
|
|
|
@@ -265,17 +265,17 @@ namespace Chromium {
|
|
|
const int ArgsCount = strArgs.GetCount();
|
|
|
LOG_TRACE("strArgs.GetCount() = %d", ArgsCount);
|
|
|
for (int i = 0; i < ArgsCount; ++i) {
|
|
|
- DbgEx("strArgs[%d] = %s", i, strArgs[i].GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("strArgs[%d] = %s", i, strArgs[i].GetData());
|
|
|
}
|
|
|
if (ArgsCount == 1) {
|
|
|
m_strCustomMainUrl = strArgs[0];
|
|
|
- DbgEx("Get custom main ulr: %s", m_strCustomMainUrl.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Get custom main ulr: %s", m_strCustomMainUrl.GetData());
|
|
|
}
|
|
|
else if (ArgsCount == 2)
|
|
|
{
|
|
|
m_strCustomMainUrl = strArgs[0];
|
|
|
m_strCustomAdUrl = strArgs[1];
|
|
|
- DbgEx("Get custom main url: %s, ad url: %s", m_strCustomMainUrl.GetData(), m_strCustomAdUrl.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Get custom main url: %s, ad url: %s", m_strCustomMainUrl.GetData(), m_strCustomAdUrl.GetData());
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
@@ -310,6 +310,10 @@ namespace Chromium {
|
|
|
m_withDebugMode = true;
|
|
|
else if (!trimStr.Compare("with_magic", true))
|
|
|
m_withMagic = true;
|
|
|
+ else if (!trimStr.Compare("with_media", true))
|
|
|
+ m_withMedia = true;
|
|
|
+ else if (!trimStr.Compare("with_specialTest", true))
|
|
|
+ m_withSpecialTest = true;
|
|
|
else if (!trimStr.Compare("with_nofilelog", true))
|
|
|
m_withNoFileLog = true;
|
|
|
}
|
|
|
@@ -321,10 +325,10 @@ namespace Chromium {
|
|
|
m_withMin = false;
|
|
|
m_withClose = false;
|
|
|
#endif
|
|
|
- DbgEx("MachineType: %s, find %s, readStr:%s, m_runAd:%d, m_runMain:%d, m_runExtend:%d, m_runLogin:%d, \
|
|
|
- m_withBrowser:%d, with_min:%d, with_close:%d, m_withDebugMode:%d, m_withMagic:%d, m_withNoFileLog:%d",
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("MachineType: %s, find %s, readStr:%s, m_runAd:%d, m_runMain:%d, m_runExtend:%d, m_runLogin:%d, \
|
|
|
+ m_withBrowser:%d, with_min:%d, with_close:%d, m_withDebugMode:%d, m_withMagic:%d, m_withNoFileLog:%d, m_withMedia:%d, m_withSpecialTest:%d",
|
|
|
m_sysInfo.strMachineType.GetData(), webMaskKey.GetData(), webMaskStr.GetData(), m_runAd, m_runMain, m_runExtend, m_runLogin, m_withBrowser
|
|
|
- ,m_withMin, m_withClose, m_withDebugMode, m_withMagic, m_withNoFileLog);
|
|
|
+ ,m_withMin, m_withClose, m_withDebugMode, m_withMagic, m_withNoFileLog, m_withMedia, m_withSpecialTest);
|
|
|
|
|
|
if (m_withMin)
|
|
|
CModTools::get_mutable_instance().setWithMin(m_withMin);
|
|
|
@@ -332,12 +336,14 @@ namespace Chromium {
|
|
|
CModTools::get_mutable_instance().setWithClose(m_withClose);
|
|
|
|
|
|
g_logToFile = !m_withNoFileLog;
|
|
|
+ g_withMedia = m_withMedia;
|
|
|
+ m_withSpecialTest = m_withSpecialTest;
|
|
|
|
|
|
|
|
|
int forceCacheClean = false;
|
|
|
if (Error_Succeed == spConfig->ReadConfigValueInt("Chromium", "forceCacheClean", forceCacheClean) && forceCacheClean)
|
|
|
{
|
|
|
- DbgEx("forceCacheClean, call OnOnBrowserCacheClean");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("forceCacheClean, call OnOnBrowserCacheClean");
|
|
|
ResourceWatcher::BrowserCacheClean evt;
|
|
|
evt.needClean = 1;
|
|
|
OnBrowserCacheClean(NULL, 0, 0, evt);
|
|
|
@@ -345,11 +351,11 @@ namespace Chromium {
|
|
|
|
|
|
}
|
|
|
else
|
|
|
- DbgEx("can not find %s, use default", webMaskKey.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("can not find %s, use default", webMaskKey.GetData());
|
|
|
}
|
|
|
if (!m_runAd && !m_runMain && !m_runExtend && !m_withBrowser)
|
|
|
{
|
|
|
- DbgEx("can not open centerSetting, maybe fault");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("can not open centerSetting, maybe fault");
|
|
|
}
|
|
|
|
|
|
CSimpleString translatePath;
|
|
|
@@ -366,6 +372,13 @@ namespace Chromium {
|
|
|
|
|
|
boost::thread(boost::bind(&CChromiumEntity::DoWithSysVarEvent, this)).detach();//用于处理sysvar，避免由于阻塞动作，导致实体卡住，lost
|
|
|
}
|
|
|
+ if (m_withSpecialTest)
|
|
|
+ {
|
|
|
+ CSimpleString strPath;
|
|
|
+ GetFunction()->GetPath("Downloads", strPath);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Downloads path %s, ", strPath.GetData());
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
bool CChromiumEntity::OnPreStart_socketStart(CAutoArray<CSimpleStringA>& strArgs, CSmartPointer<ITransactionContext>& pTransactionContext)
|
|
|
@@ -373,7 +386,7 @@ namespace Chromium {
|
|
|
ErrorCodeEnum Error;
|
|
|
if (Error_Succeed != (Error = GetFunction()->StartTcpBridgeServer(m_iTcpBridgePort)))
|
|
|
{
|
|
|
- DbgEx("start tcp bridge server failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("start tcp bridge server failed!");
|
|
|
pTransactionContext->SendAnswer(Error);
|
|
|
return false;
|
|
|
}
|
|
|
@@ -381,7 +394,7 @@ namespace Chromium {
|
|
|
CSimpleStringA strStructPath;
|
|
|
GetFunction()->GetPath("Base", strStructPath);
|
|
|
strStructPath.Append(CSimpleStringA(SPLIT_SLASH_STR) + "res" + SPLIT_SLASH_STR + "StructConfig" + SPLIT_SLASH_STR);
|
|
|
- DbgEx("find struct config files in path %s", strStructPath.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("find struct config files in path %s", strStructPath.GetData());
|
|
|
m_pWsServer = new CWebsocketServer(strStructPath, this);
|
|
|
m_pWsServer->run();
|
|
|
|
|
|
@@ -397,25 +410,25 @@ namespace Chromium {
|
|
|
if (Error_Succeed == Error) {
|
|
|
this->GetFunction()->GetPrivilegeFunction()->RefreshFrameworkState(FrameworkState_NotDisturb);
|
|
|
} else {
|
|
|
- DbgEx("subscribe log for notify failed! %s", SpStrError(Error));
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("subscribe log for notify failed! %s", SpStrError(Error));
|
|
|
}
|
|
|
#endif //RVC_OS_LINUX
|
|
|
|
|
|
if (!m_withBrowser)
|
|
|
{
|
|
|
- DbgEx("subscribe AccessAuthorization %s, %d",
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("subscribe AccessAuthorization %s, %d",
|
|
|
Error_Succeed == (Error = GetFunction()->SubscribeLog(m_uuidAccessAuth, this, Log_Event, Severity_None, Error_IgnoreAll, -1, "AccessAuthorization")) ? "success" : "failed", Error);
|
|
|
|
|
|
- DbgEx("subscribe ResourceWatcher %s, %d",
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("subscribe ResourceWatcher %s, %d",
|
|
|
Error_Succeed == (Error = GetFunction()->SubscribeBroadcast("ResourceWatcher", NULL, this, m_uuidResourceWatch)) ? "success" : "failed", Error);
|
|
|
|
|
|
|
|
|
if (Error_Succeed != GetFunction()->RegistSysVarEvent("UIState", this))
|
|
|
- DbgEx("RegistSysVarEvent UIState failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RegistSysVarEvent UIState failed!");
|
|
|
if (Error_Succeed != GetFunction()->RegistSysVarEvent("TerminalStage", this))
|
|
|
- DbgEx("RegistSysVarEvent TerminalStage failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RegistSysVarEvent TerminalStage failed!");
|
|
|
if (Error_Succeed != GetFunction()->RegistSysVarEvent("CardStoreInUse", this))
|
|
|
- DbgEx("RegistSysVarEvent CardStoreInUse failed!");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RegistSysVarEvent CardStoreInUse failed!");
|
|
|
}
|
|
|
|
|
|
return true;
|
|
|
@@ -435,7 +448,7 @@ namespace Chromium {
|
|
|
ErrorCodeEnum rc = ErrorCodeEnum::Error_Succeed;
|
|
|
if ((rc = GetFunction()->GetSysVar("TerminalStage", t_terminalState)) != ErrorCodeEnum::Error_Succeed)
|
|
|
{
|
|
|
- DbgEx("%s read TerminalStage Error %d, maybe not exist", __FUNCTION__, rc);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("%s read TerminalStage Error %d, maybe not exist", __FUNCTION__, rc);
|
|
|
break;
|
|
|
}
|
|
|
else if ('A' != t_terminalState[0] && 'Z' != t_terminalState[0])
|
|
|
@@ -444,20 +457,20 @@ namespace Chromium {
|
|
|
break;//run IEBrowser
|
|
|
if ('X' == t_terminalState[0])
|
|
|
{
|
|
|
- DbgEx("do not begin accessAuth, terminalStage X, do nothing.");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("do not begin accessAuth, terminalStage X, do nothing.");
|
|
|
break;
|
|
|
}
|
|
|
else if ('S' == t_terminalState[0])
|
|
|
{
|
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::warnPrompt,
|
|
|
std::tuple <std::string, std::string>(m_sysInfo.strTerminalID.GetData(), generateTimeStr()));
|
|
|
- DbgEx("access failed, open page warnPrompt %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("access failed, open page warnPrompt %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::breakdown,
|
|
|
std::tuple <std::string, std::string>(m_sysInfo.strTerminalID.GetData(), generateTimeStr()));
|
|
|
- DbgEx("access failed, open page breakdown %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("access failed, open page breakdown %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
@@ -491,12 +504,12 @@ namespace Chromium {
|
|
|
void CChromiumEntity::openAdPage()
|
|
|
{
|
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::Ad);
|
|
|
- DbgEx("open page Ad %s, pid:%d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("open page Ad %s, pid:%d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
}
|
|
|
void CChromiumEntity::openExtendPage()
|
|
|
{
|
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::extend);
|
|
|
- DbgEx("open page extend %s， pid:%d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("open page extend %s， pid:%d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
}
|
|
|
|
|
|
void CChromiumEntity::openInstallPage()
|
|
|
@@ -507,7 +520,7 @@ namespace Chromium {
|
|
|
return;
|
|
|
*/
|
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::Install);
|
|
|
- DbgEx("open page install %s， pid:%d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("open page install %s， pid:%d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -574,11 +587,11 @@ namespace Chromium {
|
|
|
CSimpleStringA t_terminalState;
|
|
|
if (ErrorCodeEnum::Error_Succeed == GetFunction()->GetSysVar("TerminalStage", t_terminalState))
|
|
|
{
|
|
|
- DbgEx("OnPreStart TerminalStage:%s", t_terminalState.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("OnPreStart TerminalStage:%s", t_terminalState.GetData());
|
|
|
startWithCfg();//属于chromium重启或者其他情况，已经初始化好配置
|
|
|
}
|
|
|
else
|
|
|
- DbgEx("subscribe VtmLoader %s",
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("subscribe VtmLoader %s",
|
|
|
(Error_Succeed == GetFunction()->SubscribeLog(m_uuidVTMLoader, this, Log_Event, Severity_None, Error_IgnoreAll, -1, "VtmLoader")) ? "success" : "failed");
|
|
|
};
|
|
|
|
|
|
@@ -613,7 +626,7 @@ namespace Chromium {
|
|
|
if (firstEnter)
|
|
|
{
|
|
|
firstEnter = false;
|
|
|
- DbgEx("first Enter main page");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("first Enter main page");
|
|
|
m_firstStartMain.unlock();
|
|
|
LogWarn(Severity_Low, Error_Debug, LOG_SLV_CHROMIUM_OPENSUCCESS,
|
|
|
CSimpleStringA::Format("Chromium Enter main page success, %s", CModTools::get_mutable_instance().getFultureUrl().GetData()));
|
|
|
@@ -636,7 +649,7 @@ namespace Chromium {
|
|
|
}
|
|
|
}
|
|
|
else if (0 == CSimpleStringA("X").Compare(curEvent.value.c_str(), true))
|
|
|
- DbgEx("TerminalStage X, do nothing.");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("TerminalStage X, do nothing.");
|
|
|
else
|
|
|
{
|
|
|
if (!m_withBrowser)
|
|
|
@@ -644,7 +657,7 @@ namespace Chromium {
|
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(
|
|
|
0 == CSimpleStringA("S").Compare(curEvent.value.c_str(), true) ? ERR_PAGE_REASON::warnPrompt : ERR_PAGE_REASON::breakdown,
|
|
|
std::tuple < std::string, std::string>(m_sysInfo.strTerminalID.GetData(), generateTimeStr()));
|
|
|
- DbgEx("access failed, open err page %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("access failed, open err page %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
CModTools::get_mutable_instance().StopChromiumBrowser(ERR_PAGE_REASON::main);
|
|
|
}
|
|
|
}
|
|
|
@@ -656,7 +669,7 @@ namespace Chromium {
|
|
|
{
|
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::CardStoreIsBusy,
|
|
|
std::tuple <std::string, std::string>(m_sysInfo.strTerminalID.GetData(), generateTimeStr()));
|
|
|
- DbgEx("CardStoreIsBusy, open page CardStoreIsBusy %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("CardStoreIsBusy, open page CardStoreIsBusy %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
}
|
|
|
else
|
|
|
CModTools::get_mutable_instance().StopChromiumBrowser(ERR_PAGE_REASON::CardStoreIsBusy);
|
|
|
@@ -667,7 +680,7 @@ namespace Chromium {
|
|
|
|
|
|
void CChromiumEntity::OnSysVarEvent(const char* pszKey, const char* pszValue, const char* pszOldValue, const char* pszEntityName)
|
|
|
{
|
|
|
- DbgEx("OnSysVarEvent %s, old->new:%s->%s", pszKey, pszOldValue, pszValue);
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("OnSysVarEvent %s, old->new:%s->%s", pszKey, pszOldValue, pszValue);
|
|
|
SYS_EVENT_PARAM curEvent;
|
|
|
curEvent.key = pszKey;
|
|
|
curEvent.value = pszValue;
|
|
|
@@ -710,11 +723,11 @@ namespace Chromium {
|
|
|
const int ArgsCount = strArgs.GetCount();
|
|
|
LOG_TRACE("strArgs.GetCount() = %d", ArgsCount);
|
|
|
for (int i = 0; i < ArgsCount; ++i) {
|
|
|
- DbgEx("strArgs[%d] = %s", i, strArgs[i].GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("strArgs[%d] = %s", i, strArgs[i].GetData());
|
|
|
}
|
|
|
if (ArgsCount == 1) {
|
|
|
m_strCustomMainUrl = strArgs[0];
|
|
|
- DbgEx("Get custom main url: %s", m_strCustomMainUrl.GetData());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Get custom main url: %s", m_strCustomMainUrl.GetData());
|
|
|
if (!m_strCustomMainUrl.IsNullOrEmpty()) {
|
|
|
LogWarn(Severity_Low, Error_Debug, LOG_EVT_CHROMIUM_DETECT_CUSTOM_FULTURE_URL_FROM_START,
|
|
|
CSimpleStringA::Format("从模块入参获取自定义链接：%s", m_strCustomMainUrl.GetData()));
|
|
|
@@ -743,7 +756,7 @@ namespace Chromium {
|
|
|
const DWORD dwSysError, const DWORD dwUserCode, const DWORD dwEntityInstanceID, const WORD wEntityDevelID,
|
|
|
const CAutoArray<DWORD>& Param, const char* pszEntityName, const char* pszModuleName, const char* pszMessage, const linkContext& pLinkInfo)
|
|
|
{
|
|
|
- DbgEx("OnLog %x from entity %s, msg : %s", dwUserCode, NULL == pszEntityName ? "" : pszEntityName, NULL == pszMessage ? "" : pszMessage);
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("OnLog %x from entity %s, msg : %s", dwUserCode, NULL == pszEntityName ? "" : pszEntityName, NULL == pszMessage ? "" : pszMessage);
|
|
|
if (Event_VtmLoader_GetConfig_Suc == dwUserCode || Event_VtmLoader_GetConfig_Fail == dwUserCode)
|
|
|
{
|
|
|
refreshLogLevel();//后置后需要刷新log level，因为chromium是先启动的实体
|
|
|
@@ -765,18 +778,18 @@ namespace Chromium {
|
|
|
{
|
|
|
for (auto it : notifyPool)
|
|
|
{
|
|
|
- DbgEx("Log_Notify err, notifyPool to %d, %d", it.first, it.second);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Log_Notify err, notifyPool to %d, %d", it.first, it.second);
|
|
|
m_pWsServer->do_send_notifyMsg(it.first, it.second, notifyReason, notifymsg, notiryRebootTime, dwSysError, dwUserCode);
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::ErrNotify, { m_sysInfo.strTerminalID.GetData(), generateTimeStr() }, { notifyReason, notifymsg, notiryRebootTime, dwSysError, dwUserCode });
|
|
|
- DbgEx("Log_Notify err, open page %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Log_Notify err, open page %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
}
|
|
|
}
|
|
|
catch (std::exception& e) {
|
|
|
- DbgEx("Log_Notify err, %s", e.what());
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Log_Notify err, %s", e.what());
|
|
|
}
|
|
|
return;
|
|
|
}
|
|
|
@@ -785,7 +798,7 @@ namespace Chromium {
|
|
|
|
|
|
void CChromiumEntity::OnTerminalManage(const char* pszEntityName, DWORD dwMessageId, DWORD dwMessageSignature, HealthManager::TerminalManager& evt)
|
|
|
{
|
|
|
- DbgEx("OnTerminalManage : evt.op = %d", evt.op);
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("OnTerminalManage : evt.op = %d", evt.op);
|
|
|
switch (evt.op)
|
|
|
{
|
|
|
case 0:
|
|
|
@@ -793,13 +806,13 @@ namespace Chromium {
|
|
|
{
|
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::TerminalManagerOff,
|
|
|
std::tuple < std::string, std::string>(m_sysInfo.strTerminalID.GetData(), generateTimeStr()));
|
|
|
- DbgEx("TerminalManagerState L, open page TerminalManagerOff %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("TerminalManagerState L, open page TerminalManagerOff %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
}
|
|
|
break;
|
|
|
case 1:
|
|
|
GetFunction()->SetSysVar("TerminalManagerState", "N", true);
|
|
|
{
|
|
|
- DbgEx("TerminalManagerState N, try close TerminalManager");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("TerminalManagerState N, try close TerminalManager");
|
|
|
CModTools::get_mutable_instance().killChromiumByName((+PAGE_TYPE::TerminalManager)._to_string());
|
|
|
}
|
|
|
break;
|
|
|
@@ -808,13 +821,13 @@ namespace Chromium {
|
|
|
{
|
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::TerminalManagerKickOut,
|
|
|
std::tuple < std::string, std::string>(m_sysInfo.strTerminalID.GetData(), generateTimeStr()));
|
|
|
- DbgEx("TerminalManagerState K, open page TerminalManagerKickOut %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("TerminalManagerState K, open page TerminalManagerKickOut %s, %d", Error_Succeed == openRet.first ? "success" : "fail", openRet.second);
|
|
|
}
|
|
|
break;
|
|
|
case 99:
|
|
|
GetFunction()->SetSysVar("TerminalManagerState", "N", true);
|
|
|
{
|
|
|
- DbgEx("TerminalManagerState N, try close TerminalManager");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("TerminalManagerState N, try close TerminalManager");
|
|
|
CModTools::get_mutable_instance().killChromiumByName((+PAGE_TYPE::TerminalManager)._to_string());
|
|
|
}
|
|
|
break;
|
|
|
@@ -828,7 +841,7 @@ namespace Chromium {
|
|
|
|
|
|
void CChromiumEntity::OnBrowserCacheClean(const char* pszEntityName, DWORD dwMessageId, DWORD dwMessageSignature, ResourceWatcher::BrowserCacheClean& evt)
|
|
|
{
|
|
|
- DbgEx("OnOnBrowserCacheClean, needClean:%d", evt.needClean);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("OnOnBrowserCacheClean, needClean:%d", evt.needClean);
|
|
|
ErrorCodeEnum error = Error_Succeed;
|
|
|
if (!evt.needClean)
|
|
|
return;
|
|
|
@@ -836,7 +849,7 @@ namespace Chromium {
|
|
|
CSimpleString tmpCacheDir;
|
|
|
if (Error_Succeed != (error = GetFunction()->GetPath("Temp", tmpCacheDir)) || tmpCacheDir.GetLength() == 0)
|
|
|
{
|
|
|
- DbgEx("OnBrowserCacheClean get cache path err, %d", error);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("OnBrowserCacheClean get cache path err, %d", error);
|
|
|
return;
|
|
|
}
|
|
|
#if (defined _WIN32 || defined _WIN64)
|
|
|
@@ -977,10 +990,10 @@ namespace Chromium {
|
|
|
void CChromiumEntity::OnTaskTimerListener(void* pData)
|
|
|
{
|
|
|
static int max_restartTime = 3;
|
|
|
- DbgEx("OnTaskTimerListener");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("OnTaskTimerListener");
|
|
|
if (max_restartTime == 0)
|
|
|
{
|
|
|
- DbgEx("max_restartTime == 0, do not restart chromium");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("max_restartTime == 0, do not restart chromium");
|
|
|
GetFunction()->KillTimer(CHROMIUM_TIMER_ID);
|
|
|
return;
|
|
|
}
|
|
|
@@ -995,7 +1008,7 @@ namespace Chromium {
|
|
|
|
|
|
auto rc = CModTools::get_mutable_instance().StartChromiumBrowser();
|
|
|
max_restartTime--;
|
|
|
- DbgEx("TaskTimerListen, startChromiumBrowser, rc:%d, pid:%d", rc.first, rc.second);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("TaskTimerListen, startChromiumBrowser, rc:%d, pid:%d", rc.first, rc.second);
|
|
|
if (0 == rc.first)
|
|
|
GetFunction()->KillTimer(CHROMIUM_TIMER_ID);
|
|
|
|
|
|
@@ -1006,22 +1019,22 @@ namespace Chromium {
|
|
|
HANDLE defaultProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, rc.second);
|
|
|
if (defaultProcess == nullptr)
|
|
|
{
|
|
|
- DbgEx("OnTaskTimerListener, openProcess failed");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("OnTaskTimerListener, openProcess failed");
|
|
|
return;
|
|
|
}
|
|
|
auto ret = assigntoJob(defaultProcess, rc.second);
|
|
|
if (!ret.first)
|
|
|
- DbgEx("OnTaskTimerListener, assigntoJob failed");
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("OnTaskTimerListener, assigntoJob failed");
|
|
|
else
|
|
|
{
|
|
|
auto monitorThread = [&](HANDLE job, HANDLE process) {
|
|
|
while (1)
|
|
|
{
|
|
|
if (WaitForSingleObject(process, 10) != WAIT_OBJECT_0) //process end
|
|
|
- DbgEx("default cefclient.exe job:%d, process:%d checkOpen", job, process);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("default cefclient.exe job:%d, process:%d checkOpen", job, process);
|
|
|
else
|
|
|
{
|
|
|
- DbgEx("default cefclient.exe job:%d, process:%d check Closed, try to restart", job, process);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("default cefclient.exe job:%d, process:%d check Closed, try to restart", job, process);
|
|
|
|
|
|
TerminateJobObject(job, 0);
|
|
|
max_restartTime--;
|
|
|
@@ -1041,12 +1054,12 @@ namespace Chromium {
|
|
|
|
|
|
if (Error_Succeed != rc.first)
|
|
|
{
|
|
|
- DbgEx("OnTaskTimerListener will be called after %d secs, rest restart time %d", 15, max_restartTime);
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("OnTaskTimerListener will be called after %d secs, rest restart time %d", 15, max_restartTime);
|
|
|
if (max_restartTime)
|
|
|
GetFunction()->ResetTimer(CHROMIUM_TIMER_ID, 15000);
|
|
|
}
|
|
|
else {
|
|
|
- DbgEx("OnTaskTimerListener rc = succeed");
|
|
|
+ DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("OnTaskTimerListener rc = succeed");
|
|
|
GetFunction()->KillTimer(CHROMIUM_TIMER_ID);
|
|
|
}
|
|
|
#endif
|
陈良瑜80374463