UNLOZE/projects-jenz
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes the check for deletion type as it is now .xz instead of .zip, reduces amount of days before deletion to 8. extended tar command to block most directories throwing permissions errors

Browse Source
This commit is contained in:
jenz 2023-03-02 12:47:57 +01:00
parent 272024d9f4
commit 948d74ec5d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
file_mover/remote_local_dir.py
View File

@ -36,7 +36,7 @@ class local_dir_remote:
source_files = self.list_dir(True) source_files = self.list_dir(True)
zipname = f'{job["zipname"]}-{str(datetime.now()).split(" ")[0]}.tar.xz' zipname = f'{job["zipname"]}-{str(datetime.now()).split(" ")[0]}.tar.xz'
#-T3 = 3 threads, the backups are meant to run in the night at 5 am to not interfere with players. #-T3 = 3 threads, the backups are meant to run in the night at 5 am to not interfere with players.
exec_command_state = f"XZ_OPT='-T3 --memlimit-compress=70%' tar -cJf {zipname} {self.path}" exec_command_state = f"XZ_OPT='-T3 --memlimit-compress=70%' tar --exclude='/home/gameservers/.python_history' --exclude='/home/gameservers/.cache' --exclude='/home/gameservers/css_mg/cstrike/demos' --exclude='/home/gameservers/css_mg/cstrike/download' --exclude='/home/gameservers/css_mg/cstrike/addons/sourcemod/data' --exclude='/home/gameservers/css_jb/cstrike/logs' --exclude='/home/gameservers/css_jb/cstrike/download' --exclude='/home/gameservers/css_jb/cstrike/downloadlists' --exclude='/home/gameservers/css_ze/cstrike/download' --exclude='/home/gameservers/css_2_ze/cstrike/download' --exclude='/home/gameservers/css_dev/cstrike/download' --exclude='/home/gameservers/css_2_ze/cstrike/addons/sourcemod/data' --exclude='/home/gameservers/svencoop/svencoop/logs' --exclude='/home/gameservers/css_gg/cstrike/logs' --exclude='/home/gameservers/css_gg/cstrike/download' --exclude='/home/gameservers/css_gg/cstrike/downloadlists' --exclude='/home/gameservers/css_mg_dev/cstrike/demos' --exclude='/home/gameservers/css_mg_dev/cstrike/download' --exclude='/home/gameservers/css_zr/cstrike/download' -cJf {zipname} {self.path}"
print("exec_command_state: ", exec_command_state) print("exec_command_state: ", exec_command_state)
subprocess.run([exec_command_state], shell=True) subprocess.run([exec_command_state], shell=True)

4
file_mover/remote_sftp.py
View File

@ -190,11 +190,11 @@ class sftp_remote:
for directories in self.sftp.listdir(backups_dir): for directories in self.sftp.listdir(backups_dir):
for files in self.sftp.listdir(f'{backups_dir}/{directories}'): for files in self.sftp.listdir(f'{backups_dir}/{directories}'):
pathfile = f'{backups_dir}/{directories}/{files}' pathfile = f'{backups_dir}/{directories}/{files}'
if not pathfile.endswith(".zip"): if not pathfile.endswith(".xz"):
continue continue
utime = self.sftp.stat(pathfile).st_mtime utime = self.sftp.stat(pathfile).st_mtime
last_modified = datetime.fromtimestamp(utime) last_modified = datetime.fromtimestamp(utime)
self.delete_file(last_modified, pathfile, 10) self.delete_file(last_modified, pathfile, 8)
self.disconnect() self.disconnect()
def delete_remote_zip_temp(self, zipname): def delete_remote_zip_temp(self, zipname):