antizapret fix by inpos
parent
89d23556bb
commit
55cb8797e2
|
@ -14,28 +14,36 @@ if not os.path.exists(CACHE_DIR):
|
||||||
|
|
||||||
CACHE = 24 * 3600 # 24 hour caching
|
CACHE = 24 * 3600 # 24 hour caching
|
||||||
|
|
||||||
@contextmanager
|
#@contextmanager
|
||||||
def shelf(filename, ttl=0):
|
def shelf(filename, ttl=0):
|
||||||
import shelve
|
import shelve
|
||||||
filename = os.path.join(CACHE_DIR, filename)
|
filename = os.path.join(CACHE_DIR, filename)
|
||||||
with LOCKS.get(filename, threading.RLock()):
|
with LOCKS.get(filename, threading.RLock()):
|
||||||
with closing(shelve.open(filename, writeback=True)) as d:
|
# with closing(shelve.open(filename, writeback=True)) as d:
|
||||||
|
d = shelve.open(filename, writeback=True)
|
||||||
|
try:
|
||||||
import time
|
import time
|
||||||
if not d:
|
if not dict(d):
|
||||||
d.update({
|
d.update({
|
||||||
"created_at": time.time(),
|
"created_at": time.time(),
|
||||||
"data": {},
|
"data": {},
|
||||||
})
|
})
|
||||||
elif ttl > 0 and (time.time() - d["created_at"]) > ttl:
|
elif ttl > 0 and (time.time() - d["created_at"]) > ttl:
|
||||||
|
d["created_at"] = time.time()
|
||||||
d["data"] = {}
|
d["data"] = {}
|
||||||
yield d["data"]
|
return d
|
||||||
|
except:
|
||||||
|
d.close()
|
||||||
|
raise
|
||||||
|
|
||||||
_config = {}
|
_config = {}
|
||||||
|
|
||||||
def config():
|
def config():
|
||||||
global _config
|
global _config
|
||||||
if not _config:
|
if not _config:
|
||||||
with shelf("antizapret.pac_config", ttl=CACHE) as pac_config:
|
# with shelf("antizapret.pac_config", ttl=CACHE) as pac_config:
|
||||||
|
d = shelf("antizapret.pac_config2", ttl=CACHE)
|
||||||
|
pac_config = d['data']
|
||||||
if not pac_config:
|
if not pac_config:
|
||||||
log("[antizapret]: Fetching Antizapret PAC file on %s" %PAC_URL)
|
log("[antizapret]: Fetching Antizapret PAC file on %s" %PAC_URL)
|
||||||
try:
|
try:
|
||||||
|
@ -50,6 +58,7 @@ def config():
|
||||||
else:
|
else:
|
||||||
pac_config["server"] = None
|
pac_config["server"] = None
|
||||||
pac_config["domains"] = []
|
pac_config["domains"] = []
|
||||||
|
d.close()
|
||||||
_config = pac_config
|
_config = pac_config
|
||||||
return _config
|
return _config
|
||||||
|
|
||||||
|
@ -96,4 +105,3 @@ def url_get(url, params={}, headers={}, post = None):
|
||||||
except urllib2.HTTPError as e:
|
except urllib2.HTTPError as e:
|
||||||
log("[antizapret]: HTTP Error(%s): %s" % (e.errno, e.strerror))
|
log("[antizapret]: HTTP Error(%s): %s" % (e.errno, e.strerror))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue