gCubeSystem
/
dataminer-pool-manager
15
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@151248 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Nunzio Andrea Galante 2017-07-24 16:51:47 +00:00
parent 5b6105d780
commit 275ee16764
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java
View File

@ -67,9 +67,8 @@ public class ProductionPublishingJob extends DMPMJob ***REMOVED***
if (exitstatus == 9) ***REMOVED*** if (exitstatus == 9) ***REMOVED***
response = "SVN REPOSITORY CORRECTLY UPDATED; THE CRON JOB WILL INSTALL THE ALGORITHM "+ this.algorithm.getName() + " IN THE VRE" + targetVREName; response = "SVN REPOSITORY CORRECTLY UPDATED; THE CRON JOB WILL INSTALL THE ALGORITHM "+ this.algorithm.getName() + " IN THE VRE" + targetVREName;
writer.println(response); writer.println(response);
writer.close();
***REMOVED*** ***REMOVED***
writer.close();
return response; return response;
***REMOVED*** ***REMOVED***
@ -77,8 +76,7 @@ public class ProductionPublishingJob extends DMPMJob ***REMOVED***
public String buildInfo()***REMOVED*** public String buildInfo()***REMOVED***
return return
"\n"+ "\n"+
"Algorithm details:"+ "Algorithm details:\n"+"\n"+
"\n"+
"User: "+this.algorithm.getFullname()+"\n"+ "User: "+this.algorithm.getFullname()+"\n"+
"Algorithm name: "+this.algorithm.getName()+"\n"+ "Algorithm name: "+this.algorithm.getName()+"\n"+
"Caller VRE: "+ScopeProvider.instance.get()+"\n"+ "Caller VRE: "+ScopeProvider.instance.get()+"\n"+

18
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/StagingJob.java
View File

@ -41,10 +41,10 @@ public class StagingJob extends DMPMJob ***REMOVED***
***REMOVED*** this.rProtoCluster = rProtoCluster; ***REMOVED*** this.rProtoCluster = rProtoCluster;
this.rProtoVREName = rProtoVREName; this.rProtoVREName = rProtoVREName;
File m = new File(this.jobLogs + File.separator + this.id + "_exitStatus"); ***REMOVED***File m = new File(this.jobLogs + File.separator + this.id + "_exitStatus");
PrintWriter writer = new PrintWriter(m, "UTF-8"); ***REMOVED***PrintWriter writer = new PrintWriter(m, "UTF-8");
writer.println(this.getStatus(0)); this.getStatus(0);
writer.close(); ***REMOVED***writer.close();
***REMOVED*** ***REMOVED***
@ -122,20 +122,21 @@ public class StagingJob extends DMPMJob ***REMOVED***
if (exitstatus == 0) ***REMOVED*** if (exitstatus == 0) ***REMOVED***
response = "IN PROGRESS"; response = "IN PROGRESS";
writer.println(response); writer.println(response);
writer.close(); ***REMOVED***writer.close();
***REMOVED*** ***REMOVED***
if (exitstatus == 9) ***REMOVED*** if (exitstatus == 9) ***REMOVED***
response = "COMPLETED"; response = "COMPLETED";
writer.println(response); writer.println(response);
writer.close(); ***REMOVED***writer.close();
***REMOVED*** ***REMOVED***
if (exitstatus == 2) ***REMOVED*** if (exitstatus == 2) ***REMOVED***
response = "FAILED"; response = "FAILED";
writer.println(response); writer.println(response);
writer.close(); ***REMOVED***writer.close();
***REMOVED*** ***REMOVED***
writer.close();
return response; return response;
***REMOVED*** ***REMOVED***
@ -144,8 +145,7 @@ public class StagingJob extends DMPMJob ***REMOVED***
ServiceConfiguration a = new ServiceConfiguration(); ServiceConfiguration a = new ServiceConfiguration();
return return
"\n"+ "\n"+
"Algorithm details:"+ "Algorithm details:\n"+"\n"+
"\n"+
"User: "+this.algorithm.getFullname()+"\n"+ "User: "+this.algorithm.getFullname()+"\n"+
"Algorithm name: "+this.algorithm.getName()+"\n"+ "Algorithm name: "+this.algorithm.getName()+"\n"+
"Staging DataMiner Host: "+ a.getStagingHost()+"\n"+ "Staging DataMiner Host: "+ a.getStagingHost()+"\n"+