Эх сурвалжийг харах

!2 modify the way that uos open log

chenliangyu 1 жил өмнө
parent
commit
ad0d528e6a

+ 15 - 0
Module/mod_chromium/mod_chromium.cpp

@@ -781,6 +781,11 @@ namespace Chromium {
 		m_strArgs = strArgs;
 		m_pTransactionContext = pTransactionContext;
 		pTransactionContext->SendAnswer(Error_Succeed);
+
+#ifdef TEST_FUNCTION
+		boost::thread(boost::bind(&CChromiumEntity::testLogError, this)).detach();
+#endif // #ifdef TEST_FUNCTION
+
 		
 	}
 
@@ -895,6 +900,16 @@ namespace Chromium {
 		}
 		
 	}
+#ifdef TEST_FUNCTION
+	void CChromiumEntity::testLogError()
+	{
+		while(true)
+		{
+			LogError(SeverityLevelEnum::Severity_High, Error_Debug, LOG_WARN_CHROMIUM_VTMUSERMSG_ERR, "test log Error!");
+			boost::this_thread::sleep_for(boost::chrono::seconds(1));
+		}
+	}
+#endif
 
 	void CChromiumEntity::OnSysVarEvent(const char* pszKey, const char* pszValue, const char* pszOldValue, const char* pszEntityName)
 	{

+ 9 - 3
Module/mod_chromium/mod_chromium.h

@@ -17,6 +17,8 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/container/deque.hpp> //不知为什么,vs2010中std::deque没有函数提示
 
+//#define TEST_FUNCTION
+
 
 //ns::msg 在gcc下拼接有点问题,暂时不得不重新定义一个
 #define SP_MSG_HANDLE_NS_EX(ns, msg, ns_msg, OnMsg) \
@@ -154,8 +156,6 @@ namespace Chromium {
 		virtual void OnSysVarEvent(const char* pszKey, const char* pszValue, const char* pszOldValue, const char* pszEntityName);
 		void DoWithSysVarEvent();
 
-		
-
 		void checkUrlStartTime();
 
 		void DoBrowserCacheClearJob();
@@ -164,6 +164,12 @@ namespace Chromium {
 		bool OnPreStart_socketStart(CAutoArray<CSimpleStringA>& strArgs, CSmartPointer<ITransactionContext>& pTransactionContext);
 		bool OnPreStart_register(CAutoArray<CSimpleStringA>& strArgs, CSmartPointer<ITransactionContext>& pTransactionContext);
 		bool OnPreStart_openWeb();
+
+
+#ifdef TEST_FUNCTION
+	public:
+		void testLogError();
+#endif
 		SP_BEGIN_MSG_DISPATCH_MAP(CChromiumEntity)
 			SP_BEGIN_ENTITY_MSG("ResourceWatcher")
 			SP_MSG_HANDLE_NS_EX(ResourceWatcher, BrowserCacheClean, ResourceWatcher::BrowserCacheClean, OnBrowserCacheClean)
@@ -174,7 +180,7 @@ namespace Chromium {
 			//SP_END_ENTITY_MSG()
 			SP_END_MSG_DISPATCH_MAP()
 
-	};
 
+	};
 }
 #endif

+ 2 - 1
Module/mod_guiconsole/mod_guiconsole.cpp

@@ -1090,7 +1090,8 @@ int CGUIConsoleEntity::sync_OpenLog(const char* entity_name, void* pData)
 #else
 	// Linux 上使用 xdg-open 打开文件
 	//std::string command = std::string("gedit ") + cur.strLogPath.GetData();
-	std::string command = std::string("sudo xdg-open ") + cur.strLogPath.GetData();
+	//std::string command = std::string("sudo xdg-open ") + cur.strLogPath.GetData();
+	std::string command = std::string("sudo deepin-editor ") + cur.strLogPath.GetData() + std::string(" &");
 	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("%s ", command.c_str());
 	system(command.c_str());
 #endif