Author: bleny Date: 2010-07-09 12:21:57 +0000 (Fri, 09 Jul 2010) New Revision: 3076 Log: conf log lazy instanciation du d?\195?\169mon Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-09 11:15:51 UTC (rev 3075) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-09 12:21:57 UTC (rev 3076) @@ -44,9 +44,11 @@ new HashMap<String, JobDescription>(); - public DisworkSimulatorLauncher() { + public DisworkSimulatorLauncher() {} + + + protected synchronized DisworkDaemon getDaemon() { if (disworkDaemon == null) { - DisworkConfig config = new DisworkConfig(); String bootStrapIp = IsisFish.config.getDisworkBootstrapIp(); if (!"".equals(bootStrapIp)) { @@ -67,25 +69,26 @@ log.info("diswork not started, no bootstrap ip specified"); } } - try { - for (JobDescription job : disworkDaemon.getAllJobs("isis-fish")) { - jobs.put(job.getJobName(), job); + synchronized (jobs) { + for (JobDescription job : disworkDaemon.getAllJobs("isis-fish")) { + // jobs.put(job.getJobName(), job); + } } log.info(jobs.size() + "jobs retrieved from diswork"); } catch (DisworkException e) { log.error("unable to boot diswork FS"); throw new RuntimeException("unable to boot diswork FS", e); } + return disworkDaemon; } - // TODO 20100628 bleny upload application if needed, whatever the version protected void submitIsisApplication(String isisVersion) { try { log.info("submitting isis-fish " + isisVersion + " to diswork"); URL url = new URL("http://isis-fish.labs.libre-entreprise.org/download/version3/isis-fish-3.3.0..."); - disworkDaemon.submitApplication("isis-fish", isisVersion, url.openStream()); + getDaemon().submitApplication("isis-fish", isisVersion, url.openStream()); } catch (MalformedURLException e) { // hardcoded URL cannot be malformed } catch (DisworkException e) { @@ -150,7 +153,7 @@ try { log.info("submitting job " + jobDescription.toJSDL()); simulationItem.getControl().setText("submitting job"); - disworkDaemon.submitJob(jobDescription); + getDaemon().submitJob(jobDescription); simulationItem.getControl().setText("job submitted"); } catch (DisworkException e) { log.error("error while submiting job to diswork", e); @@ -165,7 +168,7 @@ @Override public int getCheckProgressionInterval() { - return 10 * 60; // ten minutes + return 15; } @Override @@ -188,7 +191,7 @@ try { File tempDir = FileUtil.createTempDirectory("isis-results-" + jobDescription.getJobName(), null); - Map<String, InputStream> results = disworkDaemon.getResults(jobDescription); + Map<String, InputStream> results = getDaemon().getResults(jobDescription); for (String fileName : results.keySet()) { File localFile = new File(tempDir, fileName); localFile.deleteOnExit(); @@ -201,7 +204,7 @@ ZipUtil.uncompress(localFile, SimulationStorage.getSimulationDirectory()); } } - disworkDaemon.deleteJob(jobDescription); + getDaemon().deleteJob(jobDescription); FileUtil.deleteRecursively(tempDir); } catch (IOException e) { log.error("unable to write results on the local FS", e); @@ -221,7 +224,7 @@ log.error("unknow Id" + control.getId()); } else { try { - if (disworkDaemon.isFinished(jobDescription)) { + if (getDaemon().isFinished(jobDescription)) { // downloads the results File resultDir = downloadResults(jobDescription); File controlFile = new File(resultDir, SimulationStorage.CONTROL_FILENAME); @@ -238,7 +241,7 @@ @Override public void simulationStopRequest(SimulationJob job) throws RemoteException { try { - disworkDaemon.deleteJob(jobs.get(job.getId())); + getDaemon().deleteJob(jobs.get(job.getId())); } catch (DisworkException e) { log.error("error while trying to delete a job", e); throw new RemoteException("error while trying to delete a job", e); Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties 2010-07-09 11:15:51 UTC (rev 3075) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties 2010-07-09 12:21:57 UTC (rev 3076) @@ -3,11 +3,13 @@ # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n # package level log4j.logger.fr.ifremer.isisfish=INFO log4j.logger.org.nuiton=INFO +log4j.logger.org.nuiton.diswork.daemon=DEBUG +log4j.logger.org.nuiton.diswork.fs=INFO log4j.logger.org.nuiton.j2r=DEBUG log4j.logger.analyseplans=INFO log4j.logger.exports=INFO