diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-11-23 00:12:45 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-11-23 01:27:51 +0100 |
| commit | 72dcf70db20ef5d09004b1be1355612500a32592 (patch) | |
| tree | 44e7a591ad12340e0bd00e8bf49b904d75c5c853 | |
| parent | fea6041cde7c9642007d852272573bfe97c360a3 (diff) | |
| download | mitmproxy-72dcf70db20ef5d09004b1be1355612500a32592.tar.gz mitmproxy-72dcf70db20ef5d09004b1be1355612500a32592.tar.bz2 mitmproxy-72dcf70db20ef5d09004b1be1355612500a32592.zip | |
mitmweb: fix event display
| -rw-r--r-- | mitmproxy/tools/web/app.py | 3 | ||||
| -rw-r--r-- | web/src/js/components/EventLog.jsx | 2 | ||||
| -rw-r--r-- | web/src/js/ducks/eventLog.js | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/mitmproxy/tools/web/app.py b/mitmproxy/tools/web/app.py index 8f71d8da..fa0b702f 100644 --- a/mitmproxy/tools/web/app.py +++ b/mitmproxy/tools/web/app.py @@ -72,8 +72,9 @@ def flow_to_json(flow: mitmproxy.flow.Flow) -> dict: return f -def logentry_to_json(e: log.LogEntry): +def logentry_to_json(e: log.LogEntry) -> dict: return { + "id": id(e), # we just need some kind of id. "message": e.msg, "level": e.level } diff --git a/web/src/js/components/EventLog.jsx b/web/src/js/components/EventLog.jsx index 636e3e9a..1a449511 100644 --- a/web/src/js/components/EventLog.jsx +++ b/web/src/js/components/EventLog.jsx @@ -70,7 +70,7 @@ class EventLog extends Component { export default connect( state => ({ filters: state.eventLog.filters, - events: state.eventLog.view.data, + events: state.eventLog.view, }), { close: toggleVisibility, diff --git a/web/src/js/ducks/eventLog.js b/web/src/js/ducks/eventLog.js index 776e4b08..73eaf2e8 100644 --- a/web/src/js/ducks/eventLog.js +++ b/web/src/js/ducks/eventLog.js @@ -49,14 +49,12 @@ export function toggleVisibility() { return { type: TOGGLE_VISIBILITY } } -let logId = 1 // client-side log ids are odd export function add(message, level = 'web') { let data = { - id: logId, + id: Math.random().toString(), message, level, } - logId += 2 return { type: ADD, cmd: "add", |