Author: chatellier Date: 2010-01-04 16:07:28 +0000 (Mon, 04 Jan 2010) New Revision: 2870 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl Log: Add option to disable cron launching. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-01-04 15:56:16 UTC (rev 2869) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-01-04 16:07:28 UTC (rev 2870) @@ -564,7 +564,7 @@ boolean result = getOptionAsBoolean(Option.LAUNCH_UI.key); return result; } - + /** * Get perform migration option value. * @@ -574,7 +574,7 @@ boolean result = getOptionAsBoolean(Option.PERFORM_MIGRATION.key); return result; } - + /** * Get perform vcs update option value. * @@ -585,6 +585,16 @@ return result; } + /** + * Get perform cron option value. + * + * @return perform cron option value + */ + public boolean isPerformCron() { + boolean result = getOptionAsBoolean(Option.PERFORM_CRON.key); + return result; + } + public void setSimulatorLauncher(String value) { setOption(Option.SIMULATOR_LAUNCHER.key, value); } @@ -931,6 +941,8 @@ PERFORM_MIGRATION("perform.migration", _("isisfish.config.main.performmigration.description"), "true"), /** Perform vcs update option. */ PERFORM_VCS_UPDATE("perform.vcsupdate", _("isisfish.config.main.performvcsupdate.description"), "true"), + /** Perform cron option. */ + PERFORM_CRON("perform.cron", _("isisfish.config.main.performcron.description"), "true"), /** Database directory. */ DATABASE_DIRECTORY("database.directory", _("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 15:56:16 UTC (rev 2869) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 16:07:28 UTC (rev 2870) @@ -151,9 +151,7 @@ // action after ui launched config.doAction(IsisConfig.STEP_AFTER_UI); - // start cron service - CronService cronService = new CronService(); - cronService.start(); + startCronService(); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Global IsisFish exception", e); @@ -179,6 +177,17 @@ } /** + * Start cron service (if enabled). + */ + protected static void startCronService() { + if (config.isPerformCron()) { + // start cron service + CronService cronService = new CronService(); + cronService.start(); + } + } + + /** * Move user script to nuiton dependants packages. * * Find all files containing "org.codelutin." into "org.nuiton." Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-01-04 15:56:16 UTC (rev 2869) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-01-04 16:07:28 UTC (rev 2870) @@ -162,6 +162,7 @@ isisfish.config.main.localSimulator.description=Local simulator launcher name (same process) isisfish.config.main.locale.description=user locale isisfish.config.main.monitoringDirectory.description=Folder containing all necessary information needed to restart simulation +isisfish.config.main.performcron.description=Perform all task registered in cron service isisfish.config.main.performmigration.description=Perform data migration isisfish.config.main.performvcsupdate.description=Perform vcs update isisfish.config.main.remoteCaparmor.description=Remote simulator launcher name Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-04 15:56:16 UTC (rev 2869) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-04 16:07:28 UTC (rev 2870) @@ -162,6 +162,7 @@ isisfish.config.main.localSimulator.description=Nom du simulateur local (processus courant) isisfish.config.main.locale.description=la locale utilisateur isisfish.config.main.monitoringDirectory.description=Dossier contenant les informations permettant de relancer les simulations +isisfish.config.main.performcron.description=D\u00e9marre toutes les t\u00e2ches d\u00e9finies dans le service cron isisfish.config.main.performmigration.description=Migre les donn\u00E9es isisfish.config.main.performvcsupdate.description=Met \u00E0 jour le d\u00E9p\u00F4t VCS isisfish.config.main.remoteCaparmor.description=Nom du lanceur de simulation distante Modified: isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-01-04 15:56:16 UTC (rev 2869) +++ isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-01-04 16:07:28 UTC (rev 2870) @@ -5,7 +5,7 @@ #source /usr/share/modules/init/csh #module load java/1.6.0 -<#assign commonCommand="/home3/caparmor/poussin/jdk/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --option perform.vcsupdate false --option perform.migration false" /> +<#assign commonCommand="/home3/caparmor/poussin/jdk/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --option perform.vcsupdate false --option perform.migration false --option perform.cron false" /> <#if qsubmutiplejob> <#-- localsimulationid is short simulation id version --> <#assign localsimulationid='${simulationid}_$PBS_ARRAY_INDEX' />