EnDroid

Merge lp:~gingerchris/endroid/traffic_log into lp:endroid

  1. traffic_log
  2. Merge into trunk
Proposed by ChrisD
Status: Merged
Approved by: ChrisD
Approved revision: 94
Merged at revision: 100
Proposed branch: lp:~gingerchris/endroid/traffic_log
Merge into: lp:endroid
Diff against target: 12 lines (+2/-1)
1 file modified
src/endroid/__init__.py (+2/-1)
To merge this branch: bzr merge lp:~gingerchris/endroid/traffic_log
Reviewer Review Type Date Requested Status
ChrisD Approve
Review via email: mp+252936@code.launchpad.net

Commit message

Enable twisted logging if traffic logging requested

Description of the change

Twisted logging needs to be enabled for traffic logging to come out

To post a comment you must log in.
Revision history for this message
ChrisD (gingerchris) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/endroid/__init__.py'
2--- src/endroid/__init__.py 2014-09-09 14:41:18 +0000
3+++ src/endroid/__init__.py 2015-03-13 18:02:29 +0000
4@@ -51,7 +51,8 @@
5 logfile = self.conf.get("setup", "logfile",
6 default="")
7
8- if args.logtwisted:
9+ if args.logtwisted or args.logtraffic:
10+ # Twisted logging is needed for traffic logging
11 observer = log.PythonLoggingObserver()
12 observer.start()
13

Subscribers

People subscribed via source and target branches