Merge pull request #991 from SkynetLabs/fix-airtable-blocking-in-background
do not try to run interactive docker exec
This commit is contained in:
commit
45606f657d
|
@ -100,11 +100,11 @@ async def block_skylinks_from_airtable():
|
||||||
batch_size = 1000
|
batch_size = 1000
|
||||||
for i in range(0, len(skylinks), batch_size):
|
for i in range(0, len(skylinks), batch_size):
|
||||||
cached_files_command = (
|
cached_files_command = (
|
||||||
"find /data/nginx/cache/ -type f | xargs --no-run-if-empty -n" + str(batch_size) + " grep -Els '^Skynet-Skylink: ("
|
"find /data/nginx/cache/ -type f | xargs -r grep -Els '^Skynet-Skylink: ("
|
||||||
+ "|".join(skylinks[i:i+batch_size])
|
+ "|".join(skylinks[i:i+batch_size])
|
||||||
+ ")'"
|
+ ")'"
|
||||||
)
|
)
|
||||||
cached_files_count+= int(exec('docker exec -it nginx bash -c "' + cached_files_command + ' | xargs -r rm -v | wc -l"'))
|
cached_files_count+= int(exec('docker exec nginx bash -c "' + cached_files_command + ' | xargs -r rm -v | wc -l"'))
|
||||||
|
|
||||||
if cached_files_count == 0:
|
if cached_files_count == 0:
|
||||||
return print("No nginx cached files matching blocked skylinks were found")
|
return print("No nginx cached files matching blocked skylinks were found")
|
||||||
|
|
Reference in New Issue