read config from cmd line

Author: twotwo

log_to_graphs/README.md

@@ -157,7 +157,8 @@ python ${src_dir}/numpy_helper.py -c parse -i ${ini_file} -s platform
 ### 3. data to graphs(daily_log_plot.py)
 
 ```bash
-python ${src_dir}/daily_log_plot.py -n /tmp/pay_v4.npz -p ${pic_file} -t "Web Platform Daily Report(${yesterday})" --not-show
+python ${src_dir}/daily_log_plot.py -n ${src_dir}/platform.npz -p ${pic_file} -tt
+ "Web Platform Daily Report(${yesterday})" --not-show
 cp ${pic_file} ${src_dir}/platform_daily_report.png
 ```
 

log_to_graphs/helper.ini

@@ -40,4 +40,4 @@ log_file=logs/platform.log
 # 每秒的请求数: HH:mm:ss count
 request_cmd=awk '{print substr($0,13,8) }' %(log_file)s |sort | uniq -c
 ##hour, cost, code
-resp_hour_cmd=awk -F ' - ' '{split($6,cost," " );split($5,status," " );print substr($0,13,2), cost[1], status[4]}' %(log_file)s
+resp_hour_cmd=awk -F ' - ' '{split($6,cost," " );split($5,status," " );if(status[4]<400){code=0}else{code=1};print substr($0,13,2), cost[1], code}' %(log_file)s

smtp/README.md

@@ -53,5 +53,5 @@ python mail_tool.py test #[your section name]
 ```bash
 crontab -e
 # excute on 2:20 am
-20 2 * * * python /data0/monitor/daily_logs/mail_tool.py platform
+20 2 * * * python /data0/monitor/daily_logs/mail_tool.py -i /data0/monitor/daily_logs/mail.ini -s platform
 ```

smtp/mail_tool.py

@@ -34,7 +34,7 @@
 except ImportError:
 	import json as simplejson
 
-import ConfigParser, logging
+import ConfigParser, logging, argparse
 import codecs, sys
 
 from string import Template
@@ -210,11 +210,16 @@ def send(self, msg):
 		# 	return False
 
 
-def init_smtp():
+def init_smtp(ini_file):
 	"""Load basic and smtp config from mail.ini
 	"""
 	config = ConfigParser.RawConfigParser(allow_no_value=True)
-	config.read(os.path.join(sys.path[0],'mail.ini'))
+	print ('read ini file', ini_file)
+	if not os.path.exists(ini_file):
+		# use ini in python dir
+		ini_file=os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])),ini_file)
+		print('try to use another place', ini_file)
+	config.read(ini_file)
 	base_dir = config.get('basic', 'base_dir')
 	if sys.platform == 'win32': #decode to unicode
 		base_dir = base_dir.decode('utf-8')
@@ -249,20 +254,22 @@ def load_msg(section, config):
 	return MailTool.msg(ffrom, rcpt_tos, reply_to, subject, content, files)
 
 
-def main(args):
-	"""
-	python mail_tool.py test
-	"""
-	section = 'test'
-	if len(args) > 1:
-		section = args[1]
+def main():
+	parser = argparse.ArgumentParser(prog='Mail Tool', usage='%(prog)s [options]')
+
+	parser.add_argument('-i', dest='ini', type=str, default='mail.ini',
+											help='Mail Config file')
+	parser.add_argument('-s', dest='section', type=str, default='test',
+											help='section in .ini file')
+	args = parser.parse_args()
+
 
 	# init smtp tool
-	tool, base_dir, config = init_smtp()
+	tool, base_dir, config = init_smtp(args.ini)
 
 	# send one mail
-	print('section = '+section)
-	msg = load_msg(section, config)
+	print('section = '+args.section)
+	msg = load_msg(args.section, config)
 	MailTool.show_msg(msg)
 
 	status = False
@@ -284,4 +291,7 @@ def main(args):
 	tool.close()
 
 if __name__ == '__main__':
-	main(sys.argv)
+	"""
+	python mail_tool.py -i /tmp/mail.ini -s test
+	"""
+	main()