You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2020/03/17 17:17:31 UTC
[camel-k] branch master updated: Fix #1350: remove other places
where the timer human readable format is used
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 3f615b5 Fix #1350: remove other places where the timer human readable format is used
3f615b5 is described below
commit 3f615b5c8abd78300e9e4dd10ad75c211a263238
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Tue Mar 17 18:17:04 2020 +0100
Fix #1350: remove other places where the timer human readable format is used
---
docs/modules/ROOT/pages/configuration/configuration.adoc | 2 +-
docs/modules/ROOT/pages/traits/cron.adoc | 4 ++--
pkg/trait/cron.go | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/modules/ROOT/pages/configuration/configuration.adoc b/docs/modules/ROOT/pages/configuration/configuration.adoc
index d41a3bf..0a1a86b 100644
--- a/docs/modules/ROOT/pages/configuration/configuration.adoc
+++ b/docs/modules/ROOT/pages/configuration/configuration.adoc
@@ -10,7 +10,7 @@ The syntax for properties has the form `{{my.property}}`, for example:
[source,groovy]
.props.groovy
----
-from('timer:props?period=1s')
+from('timer:props?period=1000')
.log('{{my.message}}')
----
diff --git a/docs/modules/ROOT/pages/traits/cron.adoc b/docs/modules/ROOT/pages/traits/cron.adoc
index 3364f16..a0f2ea9 100755
--- a/docs/modules/ROOT/pages/traits/cron.adoc
+++ b/docs/modules/ROOT/pages/traits/cron.adoc
@@ -11,7 +11,7 @@ in order to save resources when the integration does not need to be executed.
Integrations that start from the following components are evaluated by the cron trait: `timer`, `cron`, `quartz`.
The rules for using a Kubernetes CronJob are the following:
-- `timer`: when periods can be written as cron expressions. E.g. `timer:tick?period=1m`.
+- `timer`: when periods can be written as cron expressions. E.g. `timer:tick?period=60000`.
- `cron`, `quartz`: when the cron expression does not contain seconds (or the "seconds" part is set to 0). E.g.
`cron:tab?schedule=0/2+*+*+*+?` or `quartz:trigger?cron=0+0/2+*+*+*+?`.
@@ -27,7 +27,7 @@ The following route is materialized into a Kubernetes CronJob by the `cron` trai
.cron.groovy
[source,groovy]
----
-from('timer:groovy?period=1m') // Setting the period e.g. to '1s' restores the default behavior
+from('timer:groovy?period=60000') // Setting the period e.g. to '1000' restores the default behavior
.setBody()
.simple('Hello World from Camel K in a CronJob')
.to('log:info?showAll=false')
diff --git a/pkg/trait/cron.go b/pkg/trait/cron.go
index ab0421e..767a548 100644
--- a/pkg/trait/cron.go
+++ b/pkg/trait/cron.go
@@ -45,7 +45,7 @@ import (
// Integrations that start from the following components are evaluated by the cron trait: `timer`, `cron`, `quartz`.
//
// The rules for using a Kubernetes CronJob are the following:
-// - `timer`: when periods can be written as cron expressions. E.g. `timer:tick?period=1m`.
+// - `timer`: when periods can be written as cron expressions. E.g. `timer:tick?period=60000`.
// - `cron`, `quartz`: when the cron expression does not contain seconds (or the "seconds" part is set to 0). E.g.
// `cron:tab?schedule=0/2+*+*+*+?` or `quartz:trigger?cron=0+0/2+*+*+*+?`.
//