backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

less verbose logging about updating big captures table

Browse Source
This commit is contained in:
Noah Levitt 2016-07-05 18:45:17 -05:00
parent 5eed7061b1
commit 00f48d6566
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -51,7 +51,7 @@ except:
setuptools.setup( setuptools.setup(
name='warcprox', name='warcprox',
version='2.0.dev23', version='2.0.dev24',
description='WARC writing MITM HTTP/S proxy', description='WARC writing MITM HTTP/S proxy',
url='https://github.com/internetarchive/warcprox', url='https://github.com/internetarchive/warcprox',
author='Noah Levitt', author='Noah Levitt',

57
warcprox/bigtable.py
View File

@ -1,26 +1,26 @@
# """
# warcprox/bigtable.py - module for "big" RethinkDB table for deduplication; warcprox/bigtable.py - module for "big" RethinkDB table for deduplication;
# the table is "big" in the sense that it is designed to be usable as an index the table is "big" in the sense that it is designed to be usable as an index
# for playback software outside of warcprox, and contains information not for playback software outside of warcprox, and contains information not
# needed merely for deduplication needed merely for deduplication
#
# Copyright (C) 2015-2016 Internet Archive Copyright (C) 2015-2016 Internet Archive
#
# This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
# USA. USA.
# """
from __future__ import absolute_import from __future__ import absolute_import
@ -63,9 +63,14 @@ class RethinkCaptures:
with self._batch_lock: with self._batch_lock:
if len(self._batch) > 0: if len(self._batch) > 0:
result = self.r.table(self.table).insert(self._batch).run() result = self.r.table(self.table).insert(self._batch).run()
if result["inserted"] != len(self._batch) or sorted(result.values()) != [0,0,0,0,0,len(self._batch)]: if result["inserted"] != len(self._batch) or sorted(
raise Exception("unexpected result %s saving batch of %s entries", result, len(self._batch)) result.values()) != [0,0,0,0,0,len(self._batch)]:
self.logger.info("saved %s entries to big capture table db", len(self._batch)) raise Exception(
"unexpected result %s saving batch of %s "
"entries", result, len(self._batch))
self.logger.debug(
"saved %s entries to big capture table db",
len(self._batch))
self._batch = [] self._batch = []
except BaseException as e: except BaseException as e:
self.logger.error( self.logger.error(