Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed concurrent access to cache file #146

Merged
merged 1 commit into from
Aug 6, 2020
Merged

Fixed concurrent access to cache file #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pylintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ max-statements=50
max-parents=7

# Maximum number of attributes for a class (see R0902).
max-attributes=7
max-attributes=8

# Minimum number of public methods for a class (see R0903).
min-public-methods=1
Expand Down
9 changes: 6 additions & 3 deletions tldextract/tldextract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import logging
import os
import re
import threading

import idna

Expand Down Expand Up @@ -208,6 +209,7 @@ def __init__(self, cache_file=CACHE_FILE, suffix_list_urls=PUBLIC_SUFFIX_LIST_UR
self.suffix_list_urls = tuple(url.strip() for url in suffix_list_urls if url.strip())

self.cache_file = os.path.expanduser(cache_file or '')
self.cache_file_lock = threading.Lock()
self.fallback_to_snapshot = fallback_to_snapshot
if not (self.suffix_list_urls or self.cache_file or self.fallback_to_snapshot):
raise ValueError("The arguments you have provided disable all ways for tldextract "
Expand Down Expand Up @@ -286,8 +288,8 @@ def _get_tld_extractor(self):
4. Bundled PSL snapshot file'''
if self._extractor:
return self._extractor

tlds = self._get_cached_tlds()
with self.cache_file_lock:
tlds = self._get_cached_tlds()
if tlds:
tlds.extend(self.extra_suffixes)
self._extractor = _PublicSuffixListTLDExtractor(tlds)
Expand All @@ -311,7 +313,8 @@ def _get_tld_extractor(self):
raise Exception("tlds is empty, but fallback_to_snapshot is set"
" to false. Cannot proceed without tlds.")

self._cache_tlds(tlds)
with self.cache_file_lock:
self._cache_tlds(tlds)

tlds.extend(self.extra_suffixes)
self._extractor = _PublicSuffixListTLDExtractor(tlds)
Expand Down