fix alert bug
Merge branch 'master' of https://github.com/dianping/cat
clean code
Merge pull request #529 from jialinsun/master

fix alert bug