diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-05-05 07:45:49 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-05-05 07:45:49 +0400 |
| commit | 8a507b651930326a33dcc37260e08e27e772768c (patch) | |
| tree | 11f270c7c391dc64f493637d56b3e55ed44163d3 | |
| parent | ce1ed1204619566d2cd55d3b2cf31a0c749ba6b5 (diff) | |
| parent | 693a535978b693ccd0c07216e85492c9e9494266 (diff) | |
Merge branch 'master' of github.com:piwik/piwik2.2.1-rc2
| -rwxr-xr-x | misc/log-analytics/import_logs.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index cfa8d54944..4ffa574f07 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -1294,13 +1294,16 @@ class Recorder(object): else: args['_cvar'] = '{"1":["Not-Bot","%s"]}' % hit.user_agent + args['cvar'] = '{"1":["HTTP-code","%s"]}' % hit.status if hit.is_error or hit.is_redirect: - args['cvar'] = '{"1":["HTTP-code","%s"]}' % hit.status - args['action_name'] = '%s/URL = %s%s' % ( - hit.status, - urllib.quote(args['url'], ''), - ("/From = %s" % urllib.quote(args['urlref'], '') if args['urlref'] != '' else '') - ) + args['action_name'] = '%s/URL = %s%s' % ( + hit.status, + urllib.quote(args['url'], ''), + ("/From = %s" % urllib.quote(args['urlref'], '') if args['urlref'] != '' else '') + ) + else: + args['action_name'] = urllib.quote(args['url'], '') + if hit.generation_time_milli > 0: args['gt_ms'] = hit.generation_time_milli return args |