Skip to content
Extraits de code Groupes Projets
Valider 086aec07 rédigé par Timo Besenreuther's avatar Timo Besenreuther
Parcourir les fichiers

Merge branch 'master' of github.com:piwik/piwik

parents 49a0f7fa a2d795e2
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
misc/log-analytics/import_logs.py
+ 3
− 0
Voir le fichier @ 086aec07
...@@ -1120,6 +1120,9 @@ class Recorder(object): ...@@ -1120,6 +1120,9 @@ class Recorder(object):
'dp': '0' if config.options.reverse_dns else '1', 'dp': '0' if config.options.reverse_dns else '1',
'ua': hit.user_agent.encode('utf8'), 'ua': hit.user_agent.encode('utf8'),
} }
if config.options.replay_tracking:
# prevent request to be force recorded when option replay-tracking
args['rec'] = '0'
args.update(hit.args) args.update(hit.args)
if hit.is_download: if hit.is_download:
......
tests/resources/fake_logs_replay.log
+ 4
− 1
Voir le fichier @ 086aec07
...@@ -3,4 +3,7 @@ ...@@ -3,4 +3,7 @@
- - - [15/Aug/2012:06:18:38 +0200] "GET /piwik.php?idsite=2&rec=1&apiv=1&rand=837354687&_id=e4002ba0f2c2dd70&fla=1&java=1&dir=0&qt=0&realp=0&pdf=0&wma=0&gears=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%223%22%3A%5B%22_pks%22%2C%22SKU+VERY+nice+indeed%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22PRODUCT+name%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=Another+Product+page+with+no+category&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://forum.piwik.org/read.php?2,76977" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1" - - - [15/Aug/2012:06:18:38 +0200] "GET /piwik.php?idsite=2&rec=1&apiv=1&rand=837354687&_id=e4002ba0f2c2dd70&fla=1&java=1&dir=0&qt=0&realp=0&pdf=0&wma=0&gears=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%223%22%3A%5B%22_pks%22%2C%22SKU+VERY+nice+indeed%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22PRODUCT+name%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=Another+Product+page+with+no+category&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://forum.piwik.org/read.php?2,76977" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1"
175.41.192.40 - - [09/Aug/2012:10:10:38 +0200] "GET /blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24" 175.41.192.40 - - [09/Aug/2012:10:10:38 +0200] "GET /blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
- - - [15/Aug/2012:06:18:38 +0200] "GET /piwik.php?idsite=3&rec=1&apiv=1&rand=1976958961&_id=e4002ba0f2c2dd70&fla=1&java=1&dir=0&qt=0&realp=0&pdf=0&wma=0&gears=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%225%22%3A%5B%22_pkc%22%2C%22Electronics+%26+Cameras%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=Looking+at+Electronics+%26+Cameras+page+with+a+page+level+custom+variable&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://forum.piwik.org/read.php?2,76977" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1" - - - [15/Aug/2012:06:18:38 +0200] "GET /piwik.php?idsite=3&rec=1&apiv=1&rand=1976958961&_id=e4002ba0f2c2dd70&fla=1&java=1&dir=0&qt=0&realp=0&pdf=0&wma=0&gears=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%225%22%3A%5B%22_pkc%22%2C%22Electronics+%26+Cameras%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=Looking+at+Electronics+%26+Cameras+page+with+a+page+level+custom+variable&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://forum.piwik.org/read.php?2,76977" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1"
175.41.192.40 - - [09/Aug/2012:10:11:30 +0200] "GET /faq/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1" 175.41.192.40 - - [09/Aug/2012:10:11:30 +0200] "GET /faq/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
\ No newline at end of file 175.41.192.40 - - [15/Aug/2012:09:00:38 +0200] "GET /piwik.php?idsite=1&rec=0&apiv=1&rand=123&_id=e4002ba0f2c2dd70&fla=1&java=1&dir=0&qt=0&realp=0&pdf=0&wma=0&gears=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%223%22%3A%5B%22_pks%22%2C%22SKU2%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22PRODUCT+name%22%5D%2C%225%22%3A%5B%22_pkc%22%2C%22Electronics+%26+Cameras%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=incredible+title%21&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://example-referrer-replay.org/" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Business Everywhere 7.1.2; GTB6; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0) "
175.41.192.40 - - [15/Aug/2012:09:01:38 +0200] "GET /piwik.php?idsite=1 HTTP/1.1" 200 43 "http://example-referrer-replay.org/" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Business Everywhere 7.1.2; GTB6; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0) "
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter