Merge pull request #100 from NitorCreations/update-configuration2

add missing configuration options

CHANGELOG.md

@@ -5,8 +5,12 @@
   - Use more optimal SQL when polling workflows when database supports update returning syntax
   - Only rollback poll operation when no workflows could be allocated for executing (when multiple pollers compete for same workflows)
   - Allow configuring executor queue length with _nflow.dispatcher.executor.queue.size_
+  - nflow.transition.delay.waiterror.ms parameter was splitted to nflow.transition.delay.error.min.ms and nflow.transition.delay.error.max.ms
 - nflow-rest:
   - Add support for user-provided action description when updating a workflow instance
+  - added missing configuration options with default values
+- nflow-jetty:
+  - added missing configuration options with default values
 
 ## 1.2.0 (2014-12-23)
 
@@ -24,9 +28,9 @@
   - internal components annotated by @NFlow (required e.g. for injecting application datasource to nflow)
   - does not start anymore, if transactions are not enabled
   - defining contradictory failure transitions using permit() no longer allowed
-  - bug fixes: 
+  - bug fixes:
     - theoretical problem in optimistic locking of instance polling
-    - binary backoff integer overflow when calculating next activation after 15 retries 
+    - binary backoff integer overflow when calculating next activation after 15 retries
 - nflow-rest-api:
   - return http code 404, when the requested object is not found
   - /v1/workflow-definition (GET)
@@ -67,7 +71,7 @@
     - WorkflowState.getName() (use name() instead)
     - workflow instance "owner" (new term: "executor group")
     - WorkflowInstanceAction.workflowId (new field: workflowInstanceId)
-  - internal: 
+  - internal:
     - renamed WorkflowExecutor->WorkflowStateProcessor, WorkflowExecutorFactory->WorkflowStateProcessorFactory
     - use configured value for workflow dispatcher awaitTermination
 - nflow-rest-api
@@ -106,12 +110,12 @@
 - Do not log exception, when "Race condition in polling workflow instances detected" happens
 - Make dispatcher wait "random(0,1) * short wait time" after race condition (so that probability for race condition lowers in the next poll)
 - Sort workflow instances by id before trying to reserve them in dispatcher (otherwise deadlocks may occur)
-- Removed pollNextWorkflowInstanceIds from nflow-engine public API 
+- Removed pollNextWorkflowInstanceIds from nflow-engine public API
 
 ## 0.3.0 (2014-08-14)
 - Spring 3.2.x compatibility (previously only 4.0.x)
 - Divided nflow-engine API to internal and public java packages
-- Added 'executor group' concept: nFlow engines update heartbeat in database; workflow instances reserved for dead engines are auto-recovered 
+- Added 'executor group' concept: nFlow engines update heartbeat in database; workflow instances reserved for dead engines are auto-recovered
 - integration to metrics library http://metrics.codahale.com/
 - Starting nFlow engine through Spring lifecycle listener
 - Allow custom ThreadFactory for creating nFlow threads

nflow-engine/src/main/resources/nflow-engine.properties

@@ -1,10 +1,19 @@
+nflow.autostart=true
 nflow.executor.group=nflow
+
 nflow.dispatcher.sleep.ms=1000
 nflow.dispatcher.executor.queue.wait_until_threshold=0
+nflow.dispatcher.await.termination.seconds=60
+nflow.dispatcher.executor.queue.wait_until_threshold=0
+nflow.dispatcher.executor.thread.keepalive.seconds=0
+
+nflow.executor.timeout.seconds=900
+nflow.executor.keepalive.seconds=60
 
 nflow.transition.delay.immediate.ms=0
 nflow.transition.delay.waitshort.ms=30000
-nflow.transition.delay.waiterror.ms=7200000
+nflow.transition.delay.error.min.ms=60000
+nflow.transition.delay.error.max.ms=86400000
 
 nflow.max.state.retries=3
 

nflow-jetty/src/main/resources/nflow-jetty.properties

@@ -1,2 +1,5 @@
-jetty.host=0.0.0.0
+host=0.0.0.0
+port=7500
+terminate.timeout=30
+
 nflow.rest.allow.origin=*