diff options
Diffstat (limited to 'misc/log-analytics/import_logs.py')
| -rwxr-xr-x | misc/log-analytics/import_logs.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index 68ae819e5d..c8bbbb4e6e 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -1131,11 +1131,14 @@ class Recorder(object): path = hit.path if hit.query_string and not config.options.strip_query_string: path += config.options.query_string_delimiter + hit.query_string + + # only prepend main url if it's a path + url = (main_url if path.startswith('/') else '') + path[:1024] args = { 'rec': '1', 'apiv': '1', - 'url': (main_url + path[:1024]).encode('utf8'), + 'url': url.encode('utf8'), 'urlref': hit.referrer[:1024].encode('utf8'), 'cip': hit.ip, 'cdt': self.date_to_piwik(hit.date), @@ -1156,14 +1159,14 @@ class Recorder(object): args['_cvar'] = '{"1":["Not-Bot","%s"]}' % hit.user_agent args['bots'] = '1' if hit.is_error or hit.is_redirect: - args['_cvar'] = '{"2":["HTTP-code","%s"]}' % hit.status + 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 '') ) if hit.generation_time_milli > 0: - args['generation_time_ms'] = hit.generation_time_milli + args['gt_ms'] = hit.generation_time_milli return args def _record_hits(self, hits): |