From 275ee16764c0e0673eb38c1114eefb406b880f26 Mon Sep 17 00:00:00 2001 From: Nunzio Andrea Galante Date: Mon, 24 Jul 2017 16:51:47 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@151248 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../service/ProductionPublishingJob.java | 6 ++---- .../poolmanager/service/StagingJob.java | 18 +++++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java index 5b6a399..ca81ab9 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java @@ -67,9 +67,8 @@ public class ProductionPublishingJob extends DMPMJob ***REMOVED*** if (exitstatus == 9) ***REMOVED*** response = "SVN REPOSITORY CORRECTLY UPDATED; THE CRON JOB WILL INSTALL THE ALGORITHM "+ this.algorithm.getName() + " IN THE VRE" + targetVREName; writer.println(response); - writer.close(); ***REMOVED*** - + writer.close(); return response; ***REMOVED*** @@ -77,8 +76,7 @@ public class ProductionPublishingJob extends DMPMJob ***REMOVED*** public String buildInfo()***REMOVED*** return "\n"+ - "Algorithm details:"+ - "\n"+ + "Algorithm details:\n"+"\n"+ "User: "+this.algorithm.getFullname()+"\n"+ "Algorithm name: "+this.algorithm.getName()+"\n"+ "Caller VRE: "+ScopeProvider.instance.get()+"\n"+ diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/StagingJob.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/StagingJob.java index 54f8290..3af1cc1 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/StagingJob.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/StagingJob.java @@ -41,10 +41,10 @@ public class StagingJob extends DMPMJob ***REMOVED*** ***REMOVED*** this.rProtoCluster = rProtoCluster; this.rProtoVREName = rProtoVREName; - File m = new File(this.jobLogs + File.separator + this.id + "_exitStatus"); - PrintWriter writer = new PrintWriter(m, "UTF-8"); - writer.println(this.getStatus(0)); - writer.close(); + ***REMOVED***File m = new File(this.jobLogs + File.separator + this.id + "_exitStatus"); + ***REMOVED***PrintWriter writer = new PrintWriter(m, "UTF-8"); + this.getStatus(0); + ***REMOVED***writer.close(); ***REMOVED*** @@ -122,20 +122,21 @@ public class StagingJob extends DMPMJob ***REMOVED*** if (exitstatus == 0) ***REMOVED*** response = "IN PROGRESS"; writer.println(response); - writer.close(); + ***REMOVED***writer.close(); ***REMOVED*** if (exitstatus == 9) ***REMOVED*** response = "COMPLETED"; writer.println(response); - writer.close(); + ***REMOVED***writer.close(); ***REMOVED*** if (exitstatus == 2) ***REMOVED*** response = "FAILED"; writer.println(response); - writer.close(); + ***REMOVED***writer.close(); ***REMOVED*** + writer.close(); return response; ***REMOVED*** @@ -144,8 +145,7 @@ public class StagingJob extends DMPMJob ***REMOVED*** ServiceConfiguration a = new ServiceConfiguration(); return "\n"+ - "Algorithm details:"+ - "\n"+ + "Algorithm details:\n"+"\n"+ "User: "+this.algorithm.getFullname()+"\n"+ "Algorithm name: "+this.algorithm.getName()+"\n"+ "Staging DataMiner Host: "+ a.getStagingHost()+"\n"+