Remove old log files when user WS is full (#6245)

Benjamin Renard
1 parent 8edd6346
Showing 2 changed files with 23 additions and 6 deletions Show diff stats
php/classes/AmdaAction.php
php/classes/UserMgr.php
@@ -892,8 +892,12 @@ class AmdaAction
 		}
 		else {
 			// check disk space 
-			if ($dd->getWsSize() > DISK_QUOTA)
-				return array('success' => false, 'message' => 'Please clean up your workspace.<br/>No more space is available');
+			if ($dd->getWsSize() > DISK_QUOTA) {
+				//Try to delete log files - cf. #6245
+				if ($dd->getWsSize(TRUE) > DISK_QUOTA) {
+					return array('success' => false, 'message' => 'Please clean up your workspace.<br/>No more space is available');
+				}
+			}
 		}
  
 		$this->user = $dd->user;
@@ -661,28 +661,41 @@ class UserMgr
 		return $xml->save($file);
 	}
  
-	public function dirSize($dir) 
+	public function dirSize($dir, $files_to_delete = array()) 
 	{
 		$handle = opendir($dir);
  
 		$mas = 0;
 		while ($file = readdir($handle)) {
 			if ($file != '..' && $file != '.' && !is_dir($dir.'/'.$file)) {
+				if (in_array($file, $files_to_delete)) {
+					unlink($dir.'/'.$file);
+					continue;
+				}
 				$mas += filesize($dir.'/'.$file);
 			} 
 			else if (is_dir($dir.'/'.$file) && $file != '..' && $file != '.') {
-				$mas += $this->dirSize($dir.'/'.$file);
+				$mas += $this->dirSize($dir.'/'.$file, $files_to_delete);
 			}
 		}
 		return $mas;
 	} 
  
-	public function  getWsSize() 
+	public function  getWsSize($delete_log_files = FALSE) 
 	{
 		$dirsToCheck = array(USERDATADIR, USERTTDIR, USERWORKINGDIR);
 		$wsSize = 0;
+		if ($delete_log_files) {
+			$files_to_delete = array(
+				'example.log',
+				'cmd_output',
+			);
+		}
+		else {
+			$files_to_delete = array();
+		}
 		foreach ($dirsToCheck as $dir) 
-			if (is_dir($dir)) $wsSize += $this->dirSize($dir);
+			if (is_dir($dir)) $wsSize += $this->dirSize($dir, $files_to_delete);
  
 		return $wsSize;
 	}