https://github.com/kbengine/kbengine/issues/195

messagelog需要将不同服务组的日志区分输出到文件，同一台机器上可能有几组服务端在跑

Author: kbengine

kbe/src/server/tools/guiconsole/LogWindow.cpp

@@ -5,6 +5,7 @@
 #include "guiconsole.h"
 #include "LogWindow.h"
 #include "guiconsoleDlg.h"
+#include "common/common.h"
 #include "../../../server/tools/message_log/messagelog_interface.h"
 // CLogWindow dialog
 
@@ -287,31 +288,39 @@ void CLogWindow::onReceiveRemoteLog(std::string str, bool fromServer)
 	s.Replace(L"\n\r", L"");
 	s.Replace(L"\r", L"");
 
-	if(s.Find(L"WARNING") >= 0 || s.Find(L"S_WARN") >= 0)
+	std::vector<std::wstring> logSplit;
+	KBEngine::strutil::kbe_split<wchar_t>(s.GetBuffer(0), L' ', logSplit);
+
+	if(logSplit.size() == 0)
+		return;
+
+	s.Replace((logSplit[2] + L" " + logSplit[3]).c_str(), L"");
+
+	if(logSplit[0] == L"WARNING" || logSplit[0] == L"S_WARN")
 	{
 		if(fromServer)
 			m_warnCount++;
 
 		if(m_warnChecked)
 			m_loglist.AddString(s, RGB(0, 0, 0), RGB(255, 165, 0));
 	}
-	else if(s.Find(L"ERROR") >= 0 || s.Find(L"S_ERR") >= 0)
+	else if(logSplit[0] == L"ERROR" || logSplit[0] == L"S_ERR")
 	{
 		if(fromServer)
 			m_errCount++;
 
 		if(m_errChecked)
 			m_loglist.AddString(s, RGB(0, 0, 0), RGB(255, 0, 0));
 	}
-	else if(s.Find(L"CRITICAL") >= 0)
+	else if(logSplit[0] == L"CRITICAL")
 	{
 		if(fromServer)
 			m_errCount++;
 
 		if(m_errChecked)
 			m_loglist.AddString(s, RGB(0, 0, 0), RGB(100, 149, 237));
 	}
-	else if(s.Find(L"S_DBG") >= 0 || s.Find(L"S_NORM") >= 0 || s.Find(L"S_INFO") >= 0)
+	else if(logSplit[0] == L"S_DBG" || logSplit[0] == L"S_NORM" || logSplit[0] == L"S_INFO")
 	{
 		if(fromServer)
 			m_infoCount++;
@@ -371,7 +380,7 @@ void CLogWindow::pullLogs(KBEngine::Network::Address addr)
 		Network::Bundle bundle;
 		bundle.newMessage(MessagelogInterface::registerLogWatcher);
 
-		int32 uid = 0;
+		int32 uid = dlg->getSelTreeItemUID();
 		bundle << uid;
 
 		bundle << getSelLogTypes();
@@ -601,7 +610,8 @@ void CLogWindow::updateSettingToServer()
 	Network::Bundle bundle;
 	bundle.newMessage(MessagelogInterface::updateLogWatcherSetting);
 
-	int32 uid = 0;
+	CguiconsoleDlg* dlg = static_cast<CguiconsoleDlg*>(theApp.m_pMainWnd);
+	int32 uid = dlg->getSelTreeItemUID();
 	bundle << uid;
 
 	bundle << getSelLogTypes();
@@ -644,7 +654,6 @@ void CLogWindow::updateSettingToServer()
 		bundle << (*iter);
 	}
 
-	CguiconsoleDlg* dlg = static_cast<CguiconsoleDlg*>(theApp.m_pMainWnd);
 	HTREEITEM item = dlg->hasCheckApp(MESSAGELOG_TYPE);
 	if(item == NULL)
 	{

kbe/src/server/tools/guiconsole/guiconsoleDlg.cpp

@@ -1240,6 +1240,46 @@ COMPONENT_TYPE CguiconsoleDlg::getTreeItemComponent(HTREEITEM hItem)
 	return UNKNOWN_COMPONENT_TYPE;
 }
 
+int32 CguiconsoleDlg::getSelTreeItemUID()
+{
+	HTREEITEM hItem = m_tree.GetSelectedItem();
+	if(hItem == NULL)
+		return 0;
+
+	CString s = m_tree.GetItemText(hItem);
+	if(s.Find(L"uid[") >= 0)
+	{
+		s.Replace(L"uid[", L"");
+		s.Replace(L"]", L"");
+	}
+	else
+	{
+		hItem = m_tree.GetParentItem(hItem);
+		if(hItem == NULL)
+			return 0;
+
+		s = m_tree.GetItemText(hItem);
+		if(s.Find(L"uid[") >= 0)
+		{
+			s.Replace(L"uid[", L"");
+			s.Replace(L"]", L"");
+		}
+		else
+		{
+			s = L"";
+		}
+	}
+
+	if(s.GetLength() == 0)
+		return 0;
+
+	char* buf = KBEngine::strutil::wchar2char(s.GetBuffer(0));
+	int32 uid = atoi(buf);
+	free(buf);
+
+	return uid;
+}
+
 Network::Address CguiconsoleDlg::getTreeItemAddr(HTREEITEM hItem)
 {
 	if(hItem == NULL)
@@ -1273,6 +1313,7 @@ Network::Address CguiconsoleDlg::getTreeItemAddr(HTREEITEM hItem)
 
 	char* buf = KBEngine::strutil::wchar2char(s.GetBuffer(0));
 	std::string sbuf = buf;
+	free(buf);
 
 	std::string::size_type i = sbuf.find("[");
 	std::string::size_type j = sbuf.find("]");

kbe/src/server/tools/guiconsole/guiconsoleDlg.h

@@ -59,7 +59,8 @@ class CguiconsoleDlg : public CDialog
 	void closeCurrTreeSelChannel();
 	Network::Address getTreeItemAddr(HTREEITEM hItem);
 	COMPONENT_TYPE getTreeItemComponent(HTREEITEM hItem);
-	
+	int32 getSelTreeItemUID();
+
 	bool hasTreeComponent(Components::ComponentInfos& cinfos);
 
 	void onReceiveRemoteLog(std::string str);

kbe/src/server/tools/message_log/logwatcher.cpp

@@ -104,8 +104,8 @@ void LogWatcher::onMessage(LOG_ITEM* pLogItem)
 	if(!VALID_COMPONENT(pLogItem->componentType) || filterOptions_.componentBitmap[pLogItem->componentType] == 0)
 		return;
 
-	//if(filterOptions_.uid != pLogItem->uid)
-	//	return;
+	if(filterOptions_.uid != pLogItem->uid)
+		return;
 
 	if((filterOptions_.logtypes & pLogItem->logtype) <= 0)
 		return;