Skip to content
Snippets Groups Projects
Commit 8260c2ef authored by Alan De Smet's avatar Alan De Smet
Browse files

Bugfixes

- There is no keep_old argument.
- The argument should be temporal_dir, not temporal-dir. That trick only
  works with optional arguments where --temporal-dir turns into
  temporal_dir.
parent 3b9fcc48
Branches
No related tags found
No related merge requests found
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
import os import os
import sys import sys
import logging import logging
import datetime
import aitf.ancil import aitf.ancil
import aitf.conlog import aitf.conlog
...@@ -58,7 +59,7 @@ def parse_args(): ...@@ -58,7 +59,7 @@ def parse_args():
TEMPORAL_INVALID = "not specified filler noise" TEMPORAL_INVALID = "not specified filler noise"
TEMPORAL_CACHE_ENV = 'CSPP_GEO_AITF_TEMPORAL_CACHE' TEMPORAL_CACHE_ENV = 'CSPP_GEO_AITF_TEMPORAL_CACHE'
TEMPORAL_DEFAULT = os.environ.get(TEMPORAL_CACHE_ENV, TEMPORAL_INVALID) TEMPORAL_DEFAULT = os.environ.get(TEMPORAL_CACHE_ENV, TEMPORAL_INVALID)
ap.add_argument("temporal-dir", metavar = "DIR", nargs='?', ap.add_argument("temporal_dir", metavar = "DIR", nargs='?',
help = f'temporal directory to clean (default: environment variable {TEMPORAL_CACHE_ENV}', help = f'temporal directory to clean (default: environment variable {TEMPORAL_CACHE_ENV}',
default=TEMPORAL_DEFAULT) default=TEMPORAL_DEFAULT)
...@@ -104,19 +105,17 @@ def main(): ...@@ -104,19 +105,17 @@ def main():
else: else:
log_download_report = no_cleanup_report log_download_report = no_cleanup_report
if not args.keep_old: stats = csppfetch.CleaningStats()
from datetime import datetime with PIDLockFile(args.temporal_dir+"cleaning-process.pid") as has_lock:
stats = csppfetch.CleaningStats() if has_lock:
with PIDLockFile(args.temporal_dir+"cleaning-process.pid") as has_lock: csppfetch.delete_old_files(args.temporal_dir+"/L1b", args.oldest, stats)
if has_lock: csppfetch.delete_old_files(args.temporal_dir+"/L2", args.oldest, stats)
csppfetch.delete_old_files(args.temporal_dir+"/L1b", args.oldest, stats) if args.want_summary:
csppfetch.delete_old_files(args.temporal_dir+"/L2", args.oldest, stats) sys.stdout.write('Expiring Old Temporal Data Summary\n')
if args.want_summary: sys.stdout.write(f' Removed {stats.num_deleted} files totaling {stats.size_deleted} bytes\n')
sys.stdout.write('Expiring Old Data Summary\n') sys.stdout.write(f' Kept {stats.num_kept} files totaling {stats.size_kept} bytes\n')
sys.stdout.write(f' Removed {stats.num_deleted} files totaling {stats.size_deleted} bytes\n') else: # No lock
sys.stdout.write(f' Kept {stats.num_kept} files totaling {stats.size_kept} bytes\n') sys.stdout.write("Cleaning skipped; another process is already doing so.")
else: # No lock
sys.stdout.write("Cleaning skipped; another process is already doing so.")
return 0 return 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment