Mercurial > dive4elements > river
comparison flys-artifacts/ChangeLog @ 1970:368040e5c400
Improved the Scheduler to be able to cancel running WSPLGEN jobs.
flys-artifacts/trunk@3384 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Mon, 12 Dec 2011 08:15:12 +0000 |
| parents | baefcfba97aa |
| children | 741d2067cfe1 |
comparison
equal
deleted
inserted
replaced
| 1969:baefcfba97aa | 1970:368040e5c400 |
|---|---|
| 1 2011-12-12 Ingo Weinzierl <ingo@intevation.de> | |
| 2 | |
| 3 * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java, | |
| 4 src/main/java/de/intevation/flys/wsplgen/WSPLGENCallable.java: Renamed | |
| 5 JobExecutor to WSPLGENCallable (because it is a Callable now). In addition | |
| 6 to the call() method which starts the WSPLGEN process, this Callable | |
| 7 offers a cancelWSPLGEN() method to destroy a running WSPLGEN process. | |
| 8 | |
| 9 * src/main/java/de/intevation/flys/wsplgen/WSPLGENFuture.java: A FutureTask | |
| 10 that overrides cancel(boolean). Before this instance call | |
| 11 super.cancel(boolean), it executes WSPLGENCallable.cancelWSPLGEN() to kill | |
| 12 a running WSPLGEN process. | |
| 13 | |
| 14 * src/main/java/de/intevation/flys/wsplgen/Scheduler.java: The Scheduler is | |
| 15 no longer a Runnable. It makes now use of a ScheduledThreadPoolExecutor to | |
| 16 schedule the incoming WSPLGENJobs. The ScheduledThreadPoolExecutor has a | |
| 17 fixed number of worker threads that process the jobs. The number is 1 per | |
| 18 default; it can be modified using a System property "wsplgen.max.threads". | |
| 19 | |
| 20 * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: Added | |
| 21 a string constant SCHEDULER. | |
| 22 | |
| 23 * src/main/java/de/intevation/flys/wsplgen/SchedulerSetup.java: A | |
| 24 LifetimeListener that currently implements the systemUp() method to create | |
| 25 an instance of Scheduler. After its creation, the Scheduler is put into | |
| 26 the GlobalContext using FLYSContext.SCHEDULER as key. | |
| 27 | |
| 28 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | |
| 29 Fetch the Scheduler from GlobalContext. | |
| 30 | |
| 31 * doc/conf/conf.xml: Registered SchedulerSetup as LifetimeListener. | |
| 32 | |
| 1 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> | 33 2011-12-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> |
| 2 | 34 |
| 3 * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: | 35 * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: |
| 4 (describe): Add data items to StaticFLYSArtifacts describe-doc. | 36 (describe): Add data items to StaticFLYSArtifacts describe-doc. |
| 5 | 37 |