|
|
@@ -519,7 +519,7 @@ static void ResetRelateEnviromentVars( const char* prefix)
|
|
|
|
|
|
int FrameworkShutdown(bool bUpgrade=false,bool bRestart = true)
|
|
|
{
|
|
|
- cout << "in FrameworkShutdown,bUpgrade:" << bUpgrade << ",bRestart:" << bRestart << endl;
|
|
|
+ LOG4VTM(INFO, "in FrameworkShutdown,bUpgrade:" << bUpgrade << ",bRestart:" << bRestart);
|
|
|
if (!bUpgrade)
|
|
|
g_dwTimeBegin = GetTickCountRVC();
|
|
|
NetControl();
|
|
|
@@ -1198,7 +1198,7 @@ DWORD WINAPI DoWork(void* pData)
|
|
|
if (ReadRuninfoContent(strRunInfo))
|
|
|
{
|
|
|
LOG4VTM(INFO, "to check if need rollback.");
|
|
|
- LOG4VTM(INFO, (char*)strRunInfo.c_str());
|
|
|
+ LOG4VTM(INFO, "runinfo:" << strRunInfo);
|
|
|
if (strRunInfo.compare("111") == 0 && IsStartTimeFileExist())
|
|
|
{
|
|
|
EnterCriticalSectionRVC(g_cs);
|
|
|
@@ -1208,6 +1208,7 @@ DWORD WINAPI DoWork(void* pData)
|
|
|
}
|
|
|
else
|
|
|
LOG4VTM(WARN, "read run info failed.");
|
|
|
+
|
|
|
if (g_needToRollBack)
|
|
|
{
|
|
|
LOG4VTM(INFO, "after upgrade,time elapse,but can't wait the shake hands,so rollback.");
|
80374374