1.“python控制台”区分了命令行与输出的颜色，以方便用户更容易区分

2.増加“日志查看”中的“实时日志”现在可以使用了
3.“性能分析”中増加了“TickProfile”类型的分析支持

Author: kbengine

kbe/tools/server/pycommon/LoggerWatcher.py

@@ -18,18 +18,32 @@
 
 CONSOLE_LOG_MSGID = 65501 # log 消息
 
-KBELOG_SCRIPT_INFO    = 0x00000040
-KBELOG_SCRIPT_ERROR   = 0x00000080
-KBELOG_SCRIPT_DEBUG   = 0x00000100
-KBELOG_SCRIPT_WARNING = 0x00000200
-KBELOG_SCRIPT_NORMAL  = 0x00000400
+
+KBELOG_UNKNOWN			= 0x00000000
+KBELOG_PRINT			= 0x00000001
+KBELOG_ERROR 			= 0x00000002
+KBELOG_WARNING 			= 0x00000004
+KBELOG_DEBUG 			= 0x00000008
+KBELOG_INFO				= 0x00000010
+KBELOG_CRITICAL			= 0x00000020
+KBELOG_SCRIPT_INFO		= 0x00000040
+KBELOG_SCRIPT_ERROR		= 0x00000080
+KBELOG_SCRIPT_DEBUG 	= 0x00000100
+KBELOG_SCRIPT_WARNING	= 0x00000200
+KBELOG_SCRIPT_NORMAL	= 0x00000400
 
 logName2type = {
-	"NORMAL"  : KBELOG_SCRIPT_NORMAL,
-	"INFO"    : KBELOG_SCRIPT_INFO,
-	"ERROR"   : KBELOG_SCRIPT_ERROR,
-	"DEBUG"   : KBELOG_SCRIPT_DEBUG,
-	"WARNING" : KBELOG_SCRIPT_WARNING,
+	"PRINT"		:	KBELOG_PRINT,
+	"ERROR"		:	KBELOG_ERROR,
+	"WARNING"	:	KBELOG_WARNING,
+	"DEBUG"		:	KBELOG_DEBUG,
+	"INFO"		:	KBELOG_INFO,	
+	"CRITICAL"	:	KBELOG_CRITICAL,
+	"S_NORM"  	:	KBELOG_SCRIPT_NORMAL,
+	"S_INFO"  	: 	KBELOG_SCRIPT_INFO,
+	"S_ERR"   	: 	KBELOG_SCRIPT_ERROR,
+	"S_DBG"   	: 	KBELOG_SCRIPT_DEBUG,
+	"S_WARN" 	: 	KBELOG_SCRIPT_WARNING,
 }
 
 class LoggerWatcher:
@@ -40,7 +54,6 @@ def __init__( self ):
 		"""
 		"""
 		self.socket = None
-		
 		self.msgBuffer = "".encode()
 
 	def connect( self, ip, port ):
@@ -61,18 +74,39 @@ def close( self ):
 			self.socket.close()
 			self.socket = None
 
-	def registerToLogger( self, uid ):
+	def registerToLogger( self, uid):
 		"""
 		向logger注册
 		"""
+
 		msg = Define.BytesIO()
 		msg.write( struct.pack("=H", Logger_registerLogWatcher ) ) # command
-		msg.write( struct.pack("=H", struct.calcsize("=iIiiccB" + "i" * Define.COMPONENT_END_TYPE + "BB") ) ) # package len
+		msg.write( struct.pack("=H", struct.calcsize("=iIiiccB" + "i" * Define.COMPONENT_END_TYPE + "BB") ) ) # package len	
 		msg.write( struct.pack("=i", uid ) )
-		msg.write( struct.pack("=I", 0xffffffff) ) # logtypes filter
-		msg.write( struct.pack("=iicc", 0, 0, "\0".encode(), "\0".encode() ) ) # globalOrder, groupOrder, date, keyStr
-		msg.write( struct.pack("=B", Define.COMPONENT_END_TYPE ) ) # component type filter count
-		msg.write( struct.pack("=" + "i" * Define.COMPONENT_END_TYPE, *list( range( Define.COMPONENT_END_TYPE ) ))) # component type filter
+		msg.write( struct.pack("=I",0xffffffff) ) # logtypes filter
+		# msg.write( struct.pack("=I",KBELOG_WARNING ) ) # logtypes filter
+		msg.write( struct.pack("=iicc", 0, 0, '\0'.encode(), '\0'.encode())) # globalOrder, groupOrder, date, keyStr
+		msg.write( struct.pack("=B" ,Define.COMPONENT_END_TYPE) ) # component type filter count 
+		msg.write( struct.pack("="+"i" * Define.COMPONENT_END_TYPE, *list(range(Define.COMPONENT_END_TYPE)))) # component type filter
+		msg.write( struct.pack("=BB", 0, 1 ) ) # isfind, first
+		self.socket.sendall( msg.getvalue() )
+
+	def registerToLoggerForWeb( self, uid, components_check, logtype, globalOrder, groupOrder, searchDate, keystr ):
+		"""
+		向logger注册
+		"""
+
+		msg = Define.BytesIO()
+		d1 = str(len(searchDate.encode()))
+		d2 = str(len(keystr.encode()))
+		msg.write( struct.pack("=H", Logger_registerLogWatcher ) ) # command
+		msg.write( struct.pack("=H", struct.calcsize("=iIiiccB" + "i" * Define.COMPONENT_END_TYPE + "BB") + len(searchDate.encode()) + len(keystr.encode())) ) # package len
+		msg.write( struct.pack("=i", uid ) )
+		msg.write( struct.pack("=I",logtype) ) # logtypes filter
+		# msg.write( struct.pack("=I",KBELOG_WARNING ) ) # logtypes filter
+		msg.write( struct.pack("=ii" + d1 + "sc" + d2 + "sc", globalOrder, groupOrder, searchDate.encode() ,'\0'.encode() , keystr.encode(), '\0'.encode() )) # globalOrder, groupOrder, date, keyStr
+		msg.write( struct.pack("=B" ,Define.COMPONENT_END_TYPE) ) # component type filter count 
+		msg.write( struct.pack("="+"i" * Define.COMPONENT_END_TYPE, *list(list(components_check)))) # component type filter
 		msg.write( struct.pack("=BB", 0, 1 ) ) # isfind, first
 		self.socket.sendall( msg.getvalue() )
 
@@ -139,7 +173,7 @@ def parseLog( self, stream ):
 			pos += 4
 			if buffLen < pos + dataLen:
 				self.msgBuffer = self.msgBuffer[pos - 4:]
-				return result
+				return result 
 
 			if cmdID != CONSOLE_LOG_MSGID:
 				print( "Unknown command.(id = %s)" % cmdID )
@@ -163,11 +197,10 @@ def receiveLog( self, callbackFunc, loop = False ):
 				if len( msg ) == 0:
 					print( "Receive 0 bytes, over! fileno '%s'" % self.socket.fileno() )
 					return
-				
+			
 				ms = self.parseLog( msg )
 				if ms:
 					callbackFunc( ms )
-				
 				continue
 
 			if not loop:
@@ -177,3 +210,68 @@ def receiveLog( self, callbackFunc, loop = False ):
 			self.sendActiveTick()
 
 
+class LogWatch(object):
+	"""
+	日志输出
+	"""
+	def __init__(self,wsInst, extaddr, extport, uid, components_check, logtype, globalOrder, groupOrder, searchDate, keystr):
+		self.wsInst = wsInst
+		self.extaddr = extaddr
+		self.extport = extport
+		self.uid = uid
+		self.components_check = components_check
+		self.logtype = logtype
+		self.globalOrder = globalOrder
+		self.groupOrder = groupOrder
+		self.searchDate = searchDate
+		self.keystr = keystr
+		self.logger = LoggerWatcher()
+
+		self.pops = ""
+		self.pops_end = ""
+		self.again = 0
+		self.first = 0
+		self.sendinfo = False
+
+	def do(self):
+		"""
+		"""
+
+		self.logger.close()
+		self.logger.connect( self.extaddr, self.extport)
+		self.logger.registerToLoggerForWeb( self.uid,self.components_check, self.logtype, self.globalOrder, self.groupOrder,self.searchDate, self.keystr )
+		def onReceivedLog(logs):
+			if self.first < 2 :
+				for e in logs:
+					self.wsInst.send(e)
+				self.first = self.first + 1
+			self.pops = list.pop(logs)
+			if self.again > 0:
+				if self.pops != self.pops_end:
+					self.again = self.again - 1
+					if self.again < 0:
+						self.again = 0
+			if self.again < 6:
+				if self.pops == self.pops_end:
+					self.again = self.again + 1
+				self.wsInst.send(self.pops)
+				self.pops_end = self.pops
+			self.logger.deregisterFromLogger()
+		self.logger.receiveLog(onReceivedLog, True)
+		
+		if self.wsInst:
+			self.wsInst.close()
+		self.logger.close()
+
+	def close(self):
+		"""
+		"""
+		self.logger.close()	
+		self.logger.deregisterFromLogger()
+
+		if self.wsInst:
+			self.wsInst.close()
+		self.wsInst = None
+		
+		self.extaddr = ""
+		self.extport = 0

kbe/tools/server/webconsole/WebConsole/telnet_console.py

@@ -0,0 +1,152 @@
+# -*- coding: utf-8 -*-
+import telnetlib, sys, select
+from django.http import HttpResponse
+
+from .auth import login_check
+
+def _pre_process_cmd(cmd):
+	if cmd.endswith( b"\r\n" ):
+		return cmd
+	elif cmd[-1] == b"\r":
+		cmd += b"\n"
+	elif cmd[-1] == b"\n":
+		cmd = cmd[:-1] + b"\r\n"
+	else:
+		cmd += b"\r\n"
+	return cmd
+
+class TelnetConsole(object):
+	def __init__( self, wsInst, host, port ):
+		"""
+		"""
+		self.wsInst = wsInst
+		self.host = host
+		self.port = port
+		self.consoleInst = None
+
+	def close( self ):
+		"""
+		"""
+		if self.consoleInst:
+			self.consoleInst.close()
+		self.consoleInst = None
+
+		if self.wsInst:
+			self.wsInst.close()
+		self.wsInst = None
+		
+		self.host = ""
+		self.port = 0
+
+	def run( self ):
+		"""
+		"""
+		try:
+			self.consoleInst = telnetlib.Telnet( self.host, self.port )
+		except Exception:
+			self.wsInst.send("服务器连接失败！\n")
+			self.close()
+			return
+		
+		self.onConnectedToConsole()
+
+		try:
+			tlfd = self.consoleInst.fileno()
+			wsfd = self.wsInst.protocol.sock.fileno()
+			rlist = [ tlfd, wsfd ]
+			
+			while True:
+				rl, wl, xl = select.select(rlist, [], [], 0.1)
+				if tlfd in rl:
+					data = self.consoleInst.read_some()
+					if not data:
+						break # socket closed
+					if not self.onReceivedConsoleData( data ):
+						break
+
+				if wsfd in rl:
+					data = self.wsInst.read()
+					if data is None:
+						break # socket closed
+					if len(data) == 0:
+						continue
+					if not self.onReceivedClientData( data ):
+						break
+		except:
+			sys.excepthook( *sys.exc_info() )
+
+		self.close()
+		#return HttpResponse("")
+		return
+
+		# test code
+		"""
+		try:
+			for message in self.wsInst:
+				self.wsInst.send(message)
+		except:
+			sys.excepthook( *sys.exc_info() )
+		return
+		"""
+
+	def onConnectedToConsole( self ):
+		"""
+		template method.
+		当成功连接上telnet控制台时回调
+		"""
+		pass
+
+	def onReceivedConsoleData( self, data ):
+		"""
+		template method.
+		当从telenet控制台收到了新数据以后回调
+		"""
+		print( data )
+		self.wsInst.send( data )
+		return True
+		
+	def onReceivedClientData( self, data ):
+		"""
+		template method.
+		当从客户端收到了新数据以后回调
+		"""
+		if data == ":quit":
+			self.wsInst.close()
+			return False
+		self.consoleInst.write( _pre_process_cmd( data ) )
+		return True
+		
+
+
+
+class ProfileConsole(TelnetConsole):
+	"""
+	用于性能分析的控制台类
+	"""
+	def onConnectedToConsole( self ):
+		"""
+		template method.
+		当成功连接上telnet控制台时回调
+		"""
+		self.consoleInst.write( b"kbe\r\n" )
+		self.consoleInst.write( b":pytickprofile 10\r\n" )
+
+	def onReceivedConsoleData( self, data ):
+		"""
+		template method.
+		当从telenet控制台收到了新数据以后回调
+		"""
+		self.wsInst.send( data )
+		return True
+		
+	def onReceivedClientData( self, data ):
+		"""
+		template method.
+		当从客户端收到了新数据以后回调
+		"""
+		if data == ":":
+			self.wsInst.close()
+			return False
+		self.consoleInst.write( _pre_process_cmd( data ) )
+		return True
+		

kbe/tools/server/webconsole/WebConsole/urls.py

@@ -13,7 +13,7 @@
     1. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
 from django.conf.urls import include, url
-from . import views, auth
+from . import views, auth, views_console, views_profile, views_log
 
 urlpatterns = [
     url(r'^login$', auth.login, name = "login"),
@@ -30,6 +30,8 @@
     url(r'^components/manage$', views.components_manage, name = "components_manage"),
     url(r'^components/run$', views.components_run, name = "components_run"),
     url(r'^components/shutdown$', views.components_shutdown, name = "components_shutdown"),
+    url(r'^components/(?P<ct>[0-9]+)/shutdown$', views.components_group_shutdown, name = "components_group_shutdown"),
+    url(r'^components/(?P<ct>[0-9]+)/query$', views.components_group_query, name = "components_group_query" ),
     url(r'^components/query$', views.components_query, name = "components_query" ),
     url(r'^components/query_machines$', views.components_query_machines, name = "components_query_machines" ),
     url(r'^components/save_layout$', views.components_save_layout, name = "components_save_layout" ),
@@ -39,8 +41,15 @@
 
     url(r'^machines/show_all$', views.machines_show_all, name = "machines_show_all" ),
 
-    url(r'^console/show_components$', views.console_show_components, name = "console_show_components" ),
-    url(r'^console/connect$', views.console_connect, name = "console_connect" ),
-    url(r'^console/process_cmd$', views.console_process_cmd, name = "console_process_cmd" ),
+    url(r'^console/show_components$', views_console.show_components, name = "console_show_components" ),
+    url(r'^console/connect$', views_console.connect, name = "console_connect" ),
+    url(r'^console/process_cmd$', views_console.process_cmd, name = "console_process_cmd" ),
 
+    url(r'^profile/show_components$', views_profile.show_components, name = "console_show_components" ),
+    url(r'^profile/connect$', views_profile.connect, name = "console_connect" ),
+    url(r'^profile/process_cmd$', views_profile.process_cmd, name = "console_process_cmd" ),
+   
+    url(r'^log/connect',views_log.connect, name = "real_time_log" ),
+    url(r'^log/process_cmd$', views_log.process_cmd, name = "log_process_cmd" ),
+    url(r'^log/connect/pull',views_log.pull_log,name = "pull_log"),
 ]