opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Missed committing similar fixes to cleanup_datasets script and admin controller.

Browse Source
This commit is contained in:
Greg Von Kuster
2008-01-27 16:41:29 +00:00
parent feebcf01b2
commit c8ee253ba6
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/controllers/admin.py
+10 -3
View File
@@ -265,9 +265,16 @@ class Admin( BaseController ):
for row in dt.select( dt.c.purged=='t' ).execute():
last = time.mktime( time.strptime( row.update_time.strftime( '%a %b %d %H:%M:%S %Y' ) ) )
diff = (now-last)/3600/24 # days
if diff > days:
data = self.app.model.Dataset.get( row.id )
purged_file_name = data.file_name + "_purged"
if diff > days:
data = app.model.Dataset.get( row.id )
# First try filename directly under file_path
purged_file_name = os.path.join( data.file_path, "dataset_%d.dat_purged" % data.id )
# Only use that filename if it already exists (backward compatibility),
# otherwise construct hashed path
if not os.path.exists( purged_file_name ):
dir = os.path.join( data.file_path, *directory_hash_id( data.id ) )
# Look for file inside hashed directory
purged_file_name = os.path.abspath( os.path.join( dir, "dataset_%d.dat_purged" % data.id ) )
if os.path.isfile( purged_file_name ):
dataset_count += 1
try:
scripts/cleanup_datasets.py
+8 -1
View File
@@ -234,7 +234,14 @@ def info_remove_datasets( app, days ):
diff = (now-last)/3600/24 # days
if diff > days:
data = app.model.Dataset.get( row.id )
purged_file_name = data.file_name + "_purged"
# First try filename directly under file_path
purged_file_name = os.path.join( data.file_path, "dataset_%d.dat_purged" % data.id )
# Only use that filename if it already exists (backward compatibility),
# otherwise construct hashed path
if not os.path.exists( purged_file_name ):
dir = os.path.join( data.file_path, *directory_hash_id( data.id ) )
# Look for file inside hashed directory
purged_file_name = os.path.abspath( os.path.join( dir, "dataset_%d.dat_purged" % data.id ) )
if os.path.isfile( purged_file_name ):
print "Dataset id %s with file_size %s will be removed from disk." %( str( row.id ), str( row.file_size ) )
dataset_count += 1