Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: sitescripts/filterhits/bin/reprocess_logs.py

Issue 4615801646612480: Issue 395 - Filter hits statistics backend (Closed)
Left Patch Set: Removed db.testing flag, instead overwrite config during testing. Created March 30, 2015, 12:58 p.m.
Right Patch Set: Addressed further comments from Sebastian. Created April 2, 2015, 10:13 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « sitescripts/filterhits/bin/__init__.py ('k') | sitescripts/filterhits/db.py » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # coding: utf-8 1 # coding: utf-8
2 2
3 # This file is part of the Adblock Plus web scripts, 3 # This file is part of the Adblock Plus web scripts,
4 # Copyright (C) 2006-2015 Eyeo GmbH 4 # Copyright (C) 2006-2015 Eyeo GmbH
5 # 5 #
6 # Adblock Plus is free software: you can redistribute it and/or modify 6 # Adblock Plus is free software: you can redistribute it and/or modify
7 # it under the terms of the GNU General Public License version 3 as 7 # it under the terms of the GNU General Public License version 3 as
8 # published by the Free Software Foundation. 8 # published by the Free Software Foundation.
9 # 9 #
10 # Adblock Plus is distributed in the hope that it will be useful, 10 # Adblock Plus is distributed in the hope that it will be useful,
11 # but WITHOUT ANY WARRANTY; without even the implied warranty of 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 # GNU General Public License for more details. 13 # GNU General Public License for more details.
14 # 14 #
15 # You should have received a copy of the GNU General Public License 15 # You should have received a copy of the GNU General Public License
16 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 16 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
17 17
18 import logging
19 import MySQLdb
20 import itertools 18 import itertools
21 import json 19 import json
20 import logging
22 import os 21 import os
23 import sys 22 import sys
23
24 import MySQLdb
24 25
25 from sitescripts.utils import get_config 26 from sitescripts.utils import get_config
26 from sitescripts.filterhits import db, geometrical_mean 27 from sitescripts.filterhits import db, geometrical_mean
27 28
28 _last_log_file = None 29 _last_log_file = None
29 30
30 def log_files(dir): 31 def log_files(dir):
31 """ 32 """
32 Provides a generator of filter hits log files for the given directory. 33 Provides a generator of filter hits log files for the given directory.
33 Works recursively, relative path of log file is returned. 34 Works recursively, relative path of log file is returned.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 74
74 db_connection = db.connect() 75 db_connection = db.connect()
75 76
76 try: 77 try:
77 db.write(db_connection, sql) 78 db.write(db_connection, sql)
78 except: 79 except:
79 logging.error("Failed to process file %s, all changes rolled back." % _last_ log_file) 80 logging.error("Failed to process file %s, all changes rolled back." % _last_ log_file)
80 raise 81 raise
81 finally: 82 finally:
82 db_connection.close() 83 db_connection.close()
LEFTRIGHT

Powered by Google App Engine
This is Rietveld