增加gas_query日志的查看功能

twotwo · twotwo · commit 83cdd668033f · 2017-02-14T19:28:30.000+08:00
diff --git a/log_console/command_helper.py b/log_console/command_helper.py
@@ -98,22 +98,28 @@ def excute1(dev_id, app_id, event_filter, columns, lines='100', show_lines='100'
 		return Result(cmd, out, err, titles, raws, time.time()-start_point)
 
 	@staticmethod
-	def excute2(cmd_id, queryStr, reversed=False):
+	def excute2(cmd_id, queryStr, show_lines='100', reversed=False):
 		"""执行预定义的指令，显示执行结果
 		"""
 		config = ConfigParser.RawConfigParser(allow_no_value=True)
 		config.read('console.ini')
 		cmd = config.get('cmd', cmd_id)
 
 		if not os.access(cmd, os.F_OK):
-			cmd = 'ls -l'
+			cmd = 'ls -l 1>&2'
 		elif len(queryStr) > 0:
 			cmd = cmd + ' ' + queryStr
 		
 		(cmd, cost, out, err) = CommandUtil.excute(cmd)
 
 		raws = out.split('\n')
 
+		if reversed:
+			raws.reverse()
+			print 'reversed@excute'
+
+		if len(raws) > int(show_lines): raws = raws[0:int(show_lines)]
+
 		return Result(cmd, out, err, None, raws, cost)
 
 if __name__ == '__main__':
diff --git a/log_console/supervisor_console.ini b/log_console/supervisor_console.ini
@@ -3,7 +3,7 @@
 ;bash -c 'source /home/liyan/console/env/bin/activate; python /home/liyan/console/web_console.py'
 command=/srv/www/console/env/bin/python /srv/www/console/web_console.py
 directory=/srv/www/console
-environment=PATH="/srv/www/console/env/bin:bin:/usr/bin:/usr/local/bin"
+environment=PATH="/srv/www/console/env/bin:/bin:/usr/bin:/usr/local/bin"
 user=nobody
 stdout_logfile=/var/log/supervisor/%(program_name)s.log
 stdout_logfile_maxbytes=1MB
diff --git a/log_console/templates/gas.html b/log_console/templates/gas.html
@@ -28,6 +28,7 @@
 			}
 			.yellow {background-color: #ffff00}
 			.red {background-color: #DC143C}
+			.blue {background-color: #40E0D0}
 		</style>
 	</head>
 	<body>
@@ -57,7 +58,7 @@
 					</tbody>
 				</table>
 			</div>
-			<div class="clear"><div class="clear"><pre class="red">{{ result.err }}</pre></div></div>
+			<div class="clear"><div class="clear"><pre class="blue">{{ result.err }}</pre></div></div>
 		</div>
 	</body>
 </html>
diff --git a/log_console/web_console.py b/log_console/web_console.py
@@ -76,16 +76,36 @@ class GameAd:
 	def GET(self):
 		form = web.form.Form( 
 			web.form.Textbox("queryStr", description=u'AppID、IDFA任意关键字'),
+
+			web.form.Textbox("ShowLines", 
+				web.form.notnull,
+				web.form.regexp('\d+', 'Must be a digit'),
+				web.form.Validator('Not more than 200', lambda x:int(x)<201),
+				description=u'显示的条数', 
+				value="100", 
+			),
+
+			web.form.Checkbox('Reversed', description=u'是否倒序', value=True, checked=True), 
 		)
 		return render_template('gas.html', form=form, result = None)
 
 	def POST(self):
 		form = web.form.Form( 
 			web.form.Textbox("queryStr", description=u'AppID？IDFA？'),
+
+			web.form.Textbox("ShowLines", 
+				web.form.notnull,
+				web.form.regexp('\d+', 'Must be a digit'),
+				web.form.Validator('Not more than 200', lambda x:int(x)<201),
+				description=u'显示的条数', 
+				value="100", 
+			),
+
+			web.form.Checkbox('Reversed', description=u'是否倒序', value=True, checked=True), 
 		)
 		result = None
 		if form.validates():
-			result = CommandUtil.excute2(cmd_id='cmd_1', queryStr=form.d.queryStr)
+			result = CommandUtil.excute2(cmd_id='cmd_1', queryStr=form.d.queryStr, show_lines=form.d.ShowLines, reversed=form.d.Reversed)
 			
 		return render_template('gas.html',form=form, result=result)
 
