scott/blockinator
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Small change to the cache file handling.

Browse source
This commit is contained in:
Scott Wallace 2013-07-13 08:25:41 +01:00
parent 8a878cea62
commit dfc8e231af
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
blocklist.py
View file

@ -68,9 +68,6 @@ class BlockList:
raw_data = input_list.read() raw_data = input_list.read()
cache_file = open(cache_path, "w+") cache_file = open(cache_path, "w+")
cache_file.write(raw_data) cache_file.write(raw_data)
# Rewind the file
cache_file.seek(0)
except (urllib2.URLError, urllib2.HTTPError), error: except (urllib2.URLError, urllib2.HTTPError), error:
# Network error. Warn and use the cached content. # Network error. Warn and use the cached content.
logging.warning("Reverting to cache file. There was a problem contacting host %s: %s", hostname, error) logging.warning("Reverting to cache file. There was a problem contacting host %s: %s", hostname, error)
@ -86,8 +83,8 @@ class BlockList:
cache_file = StringIO.StringIO() cache_file = StringIO.StringIO()
cache_file.write(raw_data) cache_file.write(raw_data)
# Rewind the file # Rewind the file
cache_file.seek(0) cache_file.seek(0)
# Return the best available data # Return the best available data
return cache_file return cache_file