From 7dbfdda871d581c3d90ae9add3d6f27d7653ab29 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Thu, 2 Aug 2018 20:59:22 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31226 --- .../deploy-steps-to-bsh-bkup2.launch | 8 ----- .../deploy-steps-to-bsh-main.bat | 30 ----------------- .../deploy-steps-to-bsh-main.launch | 8 ----- .../deploy-steps-to-bsh.batx | 32 ------------------ .../deploy-steps-to-bsh2.batx | 33 ------------------- .../server/steps/TSMExtendedRetrieveStep.java | 2 ++ .../server/steps/deploy-steps-to-bsh.launch | 8 ----- 7 files changed, 2 insertions(+), 119 deletions(-) delete mode 100644 server/user.jobengine.executors/deploy-steps-to-bsh-bkup2.launch delete mode 100644 server/user.jobengine.executors/deploy-steps-to-bsh-main.bat delete mode 100644 server/user.jobengine.executors/deploy-steps-to-bsh-main.launch delete mode 100644 server/user.jobengine.executors/deploy-steps-to-bsh.batx delete mode 100644 server/user.jobengine.executors/deploy-steps-to-bsh2.batx delete mode 100644 server/user.jobengine.osgi.server/src/user/jobengine/server/steps/deploy-steps-to-bsh.launch diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh-bkup2.launch b/server/user.jobengine.executors/deploy-steps-to-bsh-bkup2.launch deleted file mode 100644 index 7e5b62eb..00000000 --- a/server/user.jobengine.executors/deploy-steps-to-bsh-bkup2.launch +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh-main.bat b/server/user.jobengine.executors/deploy-steps-to-bsh-main.bat deleted file mode 100644 index 69a77ed0..00000000 --- a/server/user.jobengine.executors/deploy-steps-to-bsh-main.bat +++ /dev/null @@ -1,30 +0,0 @@ -@ECHO OFF - -SET REMOTE_HOST=10.10.1.28 -SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4 -SET REMOTE_SERVER_ADDRESS=scp://root:password@%REMOTE_HOST% - -SET LOCAL_STEPS_LOCATION=bin/user -SET REMOTE_STEPS_LOCATION=/opt/mediacube/configuration/executors/user - -SET LOCAL_TEMPLATES_LOCATION=jobtemplates -SET REMOTE_TEMPLATES_LOCATION=/opt/mediacube/configuration/jobtemplates - - ECHO *** Deploy steps to server %REMOTE_HOST% *** - WinSCP.com /command ^ - "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^ - "lcd %LOCAL_STEPS_LOCATION%" ^ - "cd %REMOTE_STEPS_LOCATION%" ^ - "synchronize remote" ^ - "exit" - - ECHO *** Deploy templates to server %REMOTE_HOST% *** - WinSCP.com /command ^ - "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^ - "lcd %LOCAL_TEMPLATES_LOCATION%" ^ - "cd %REMOTE_TEMPLATES_LOCATION%" ^ - "synchronize remote" ^ - "exit" - -@ECHO ON - \ No newline at end of file diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh-main.launch b/server/user.jobengine.executors/deploy-steps-to-bsh-main.launch deleted file mode 100644 index b0f17ccb..00000000 --- a/server/user.jobengine.executors/deploy-steps-to-bsh-main.launch +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh.batx b/server/user.jobengine.executors/deploy-steps-to-bsh.batx deleted file mode 100644 index 63732372..00000000 --- a/server/user.jobengine.executors/deploy-steps-to-bsh.batx +++ /dev/null @@ -1,32 +0,0 @@ -@ECHO OFF - -SET REMOTE_HOST=10.10.1.27 -SET REMOTE_LOCATION=/opt/mediacube/configuration/executors -SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4 -SET REMOTE_SERVER_ADDRESS=scp://root:password@%REMOTE_HOST% -SET LOCAL_STEPS_LOCATION=bin/user/jobengine/server/steps -SET LOCAL_CONFIG_LOCATION=config - - ECHO *** Begin deploy steps to server %REMOTE_HOST% *** - ECHO --- Deploying - - WinSCP.com /command ^ - "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^ - "cd %REMOTE_LOCATION%" ^ - "lcd %LOCAL_STEPS_LOCATION%" ^ - "synchronize remote" ^ - "lcd ..\" ^ - "lcd ..\" ^ - "lcd ..\" ^ - "lcd ..\" ^ - "lcd ..\" ^ - "lcd %LOCAL_CONFIG_LOCATION%" ^ - "synchronize remote -filemask=config.xml" ^ - "cd .." ^ - "synchronize remote -filemask=scheduledjobs.json" ^ - "exit" - - ECHO *** Completed *** -@ECHO ON - - diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh2.batx b/server/user.jobengine.executors/deploy-steps-to-bsh2.batx deleted file mode 100644 index 288eec44..00000000 --- a/server/user.jobengine.executors/deploy-steps-to-bsh2.batx +++ /dev/null @@ -1,33 +0,0 @@ -@ECHO OFF - -SET REMOTE_HOST=10.10.1.27 -SET REMOTE_LOCATION=/opt/mediacube/configuration/executors -SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4 -SET REMOTE_SERVER_ADDRESS=scp://root:password@%REMOTE_HOST% -SET LOCAL_STEPS_LOCATION=bin/user/jobengine/server/steps -SET LOCAL_CONFIG_LOCATION=config - - ECHO *** Begin deploy steps to server %REMOTE_HOST% *** - ECHO --- Deploying - - WinSCP.com /command ^ - "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^ - "cd %REMOTE_LOCATION%" ^ - "lcd %LOCAL_STEPS_LOCATION%" ^ - "synchronize remote" ^ - "lcd ..\" ^ - "lcd ..\" ^ - "lcd ..\" ^ - "lcd ..\" ^ - "lcd ..\" ^ - "lcd %LOCAL_CONFIG_LOCATION%" ^ - "synchronize remote -filemask=config.xml" ^ - "cd .." ^ - "synchronize remote -filemask=scheduledjobs.json" ^ - "call pcs resource restart mediacube_script" ^ - "exit" - - ECHO *** Completed *** -@ECHO ON - - diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java index b30583a9..49c9503e 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java @@ -48,6 +48,8 @@ public class TSMExtendedRetrieveStep extends TSMRestoreStep { outStream.close(); targetUri.cleanUp(); } + } else { + super.afterRestore(targetUri, targetPath, killDateDays, targetFileName); } } diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/deploy-steps-to-bsh.launch b/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/deploy-steps-to-bsh.launch deleted file mode 100644 index f6a5a703..00000000 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/deploy-steps-to-bsh.launch +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - -- 2.54.0