diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-02-17 12:47:17 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-02-17 12:47:17 -0300 |
| commit | 9d68551773a7f428e28a84e30598583c69837238 (patch) | |
| tree | 5a18a39e4bbade135a6ccbfa37f5bc22230ae003 | |
| parent | b814e84107ae1d89e0c9d2392b6d3ef7fee4bb53 (diff) | |
| parent | b4b9f10698902005c8d463d4bf3939d40c2a2783 (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/profiling_goodies' into develop
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/util/log_silencer.py | 1 |
3 files changed, 5 insertions, 0 deletions
@@ -3,6 +3,7 @@ *.pyc *.log *.lprof +*.pstats *.*~ .* *_rc.py @@ -64,5 +64,8 @@ manpages: apidocs: @sphinx-apidoc -o docs/api src/leap/bitmask +mailprofile: + gprof2dot -f pstats /tmp/leap_mail_profile.pstats -n 0.2 -e 0.2 | dot -Tpdf -o /tmp/leap_mail_profile.pdf + clean : $(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc) diff --git a/src/leap/bitmask/util/log_silencer.py b/src/leap/bitmask/util/log_silencer.py index b9f69ad2..56b290e4 100644 --- a/src/leap/bitmask/util/log_silencer.py +++ b/src/leap/bitmask/util/log_silencer.py @@ -46,6 +46,7 @@ class SelectiveSilencerFilter(logging.Filter): # to us. SILENCER_RULES = ( 'leap.common.events', + 'leap.common.decorators', ) def __init__(self): |