Merge remote-tracking branch 'origin/debug' into debug

.gitignore

@@ -3,7 +3,7 @@
 /.idea
 /routers/.DS_Store
 /rdlucklog
-/etalogs/*
+/etalogs
 /conf/*.conf
 /binlog/*
 /*.pdf