cr feedback

uber-archive · Jul 7, 2017 · 9f1ba97 · 9f1ba97
1 parent baa6b9d
commit 9f1ba97
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/cmd/tools/admin/main.go b/cmd/tools/admin/main.go
@@ -27,7 +27,7 @@ import (
 	"github.com/codegangsta/cli"
 	"github.com/uber/cherami-server/common"
 	"github.com/uber/cherami-server/tools/admin"
-	com "github.com/uber/cherami-server/tools/common"
+	toolscommon "github.com/uber/cherami-server/tools/common"
 )
 
 const (
@@ -107,13 +107,13 @@ func main() {
 
 						cli.IntFlag{
 							Name:  "consumed_messages_retention, cr",
-							Value: com.DefaultConsumedMessagesRetention,
+							Value: toolscommon.DefaultConsumedMessagesRetention,
 							Usage: "Consumed messages retention period specified in seconds. Default is 1 hour.",
 						},
 
 						cli.IntFlag{
 							Name:  "unconsumed_messages_retention, ur",
-							Value: com.DefaultUnconsumedMessagesRetention,
+							Value: toolscommon.DefaultUnconsumedMessagesRetention,
 							Usage: "Unconsumed messages retention period specified in seconds. Default is two hours.",
 						},
 						cli.StringFlag{
@@ -143,22 +143,22 @@ func main() {
 						},
 						cli.IntFlag{
 							Name:  "lock_timeout_seconds, l",
-							Value: com.DefaultLockTimeoutSeconds,
+							Value: toolscommon.DefaultLockTimeoutSeconds,
 							Usage: usageCGLockTimeoutSeconds,
 						},
 						cli.IntFlag{
 							Name:  "max_delivery_count, m",
-							Value: com.DefaultMaxDeliveryCount,
+							Value: toolscommon.DefaultMaxDeliveryCount,
 							Usage: usageCGMaxDeliveryCount,
 						},
 						cli.IntFlag{
 							Name:  "skip_older_messages_in_seconds, k",
-							Value: com.DefaultSkipOlderMessageSeconds,
+							Value: toolscommon.DefaultSkipOlderMessageSeconds,
 							Usage: usageCGSkipOlderMessagesInSeconds,
 						},
 						cli.IntFlag{
 							Name:  "delay_seconds, d",
-							Value: com.DefaultDelayMessageSeconds,
+							Value: toolscommon.DefaultDelayMessageSeconds,
 							Usage: usageCGDelaySeconds,
 						},
 						cli.StringFlag{

diff --git a/cmd/tools/cli/main.go b/cmd/tools/cli/main.go
@@ -27,7 +27,7 @@ import (
 	"github.com/codegangsta/cli"
 	"github.com/uber/cherami-server/common"
 	lib "github.com/uber/cherami-server/tools/cli"
-	com "github.com/uber/cherami-server/tools/common"
+	toolscommon "github.com/uber/cherami-server/tools/common"
 )
 
 const (
@@ -37,7 +37,7 @@ const (
 	usageCGSkipOlderMessagesInSeconds = `Skip messages older than this duration, in seconds ('0' to skip none)`
 	usageCGDelaySeconds               = `Delay, in seconds, to defer all messages by`
 	usageCGOwnerEmail                 = "Owner email"
-	usageCGZoneConfig                 = "Zone configs for multi-zone CG. For each zone, specify \"Zone,PreferedActiveZone\"; ex: \"dca1a,false\""
+	usageCGZoneConfig                 = "Zone configs for multi-zone CG. For each zone, specify \"Zone,PreferedActiveZone\"; ex: \"zone1,false\""
 )
 
 func main() {
@@ -102,13 +102,13 @@ func main() {
 						},
 						cli.IntFlag{
 							Name:  "consumed_messages_retention, cr",
-							Value: com.DefaultConsumedMessagesRetention,
-							Usage: "Consumed messages retention period specified in seconds. Default is 1 hour.",
+							Value: toolscommon.DefaultConsumedMessagesRetention,
+							Usage: "Consumed messages retention period specified in seconds (default: 1 day)",
 						},
 						cli.IntFlag{
 							Name:  "unconsumed_messages_retention, ur",
-							Value: com.DefaultUnconsumedMessagesRetention,
-							Usage: "Unconsumed messages retention period specified in seconds. Default is two hours.",
+							Value: toolscommon.DefaultUnconsumedMessagesRetention,
+							Usage: "Unconsumed messages retention period specified in seconds (default: 3 days)",
 						},
 						cli.StringFlag{
 							Name:  "checksum_option, co",
@@ -122,7 +122,7 @@ func main() {
 						},
 						cli.StringSliceFlag{
 							Name:  "zone_config, zc",
-							Usage: "Zone configs for multi_zone destinations. Format for each zone should be \"Zone,AllowPublish,AllowConsume,ReplicaCount\". Ex: \"sjc1a,true,true,3\"",
+							Usage: "Zone configs for multi_zone destinations. Format for each zone should be \"Zone,AllowPublish,AllowConsume,ReplicaCount\". Ex: \"zone1,true,true,3\"",
 						},
 						cli.StringFlag{
 							Name:  "kafka_cluster, kc",
@@ -149,22 +149,22 @@ func main() {
 						},
 						cli.IntFlag{
 							Name:  "lock_timeout_seconds, l",
-							Value: com.DefaultLockTimeoutSeconds,
+							Value: toolscommon.DefaultLockTimeoutSeconds,
 							Usage: usageCGLockTimeoutSeconds,
 						},
 						cli.IntFlag{
 							Name:  "max_delivery_count, m",
-							Value: com.DefaultMaxDeliveryCount,
+							Value: toolscommon.DefaultMaxDeliveryCount,
 							Usage: usageCGMaxDeliveryCount,
 						},
 						cli.IntFlag{
 							Name:  "skip_older_messages_in_seconds, k",
-							Value: com.DefaultSkipOlderMessageSeconds,
+							Value: toolscommon.DefaultSkipOlderMessageSeconds,
 							Usage: usageCGSkipOlderMessagesInSeconds,
 						},
 						cli.IntFlag{
 							Name:  "delay_seconds, d",
-							Value: com.DefaultDelayMessageSeconds,
+							Value: toolscommon.DefaultDelayMessageSeconds,
 							Usage: usageCGDelaySeconds,
 						},
 						cli.StringFlag{

diff --git a/tools/common/lib.go b/tools/common/lib.go
@@ -72,9 +72,9 @@ const (
 	// ConsumerGroupType is the name for entity type for consumer group in listEntityOps
 	ConsumerGroupType = "CG"
 	// DefaultUnconsumedMessagesRetention is the default value for unconsumed messages retention
-	DefaultUnconsumedMessagesRetention = 7200
+	DefaultUnconsumedMessagesRetention = 3 * 24 * 3600 // 3 days
 	// DefaultConsumedMessagesRetention is the default value for consumed messages retention
-	DefaultConsumedMessagesRetention = 3600
+	DefaultConsumedMessagesRetention = 1 * 24 * 3600 // 1 day
 	// MinUnconsumedMessagesRetentionForMultiZoneDest is the minimum unconsumed retention allowed
 	MinUnconsumedMessagesRetentionForMultiZoneDest = 3 * 24 * 3600
 	// MinConsumedMessagesRetention is the minimum consumed retention