Merge pull request #578 from youyong205/master

refactor
refactor
Merge branch 'master' of https://github.com/dianping/cat
refactor code
Merge pull request #579 from jialinsun/master

refactor code