Skip to content

Commit

Permalink
Run mage check
Browse files Browse the repository at this point in the history
  • Loading branch information
blakerouse committed Apr 28, 2021
1 parent c6977d2 commit 377e45e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion x-pack/elastic-agent/CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
- Fix issue with status and inspect inside of container {pull}25204[25204]
- Remove FLEET_SERVER_POLICY_NAME env variable as it was not used {pull}25149[25149]
- Reduce log level for listener cleanup to debug {pull}25274
- Delay the restart of application when a status report of failure is given {pull}25339[25339]
- Passing in policy id to container command works {pull}25352[25352]
- Reduce log level for listener cleanup to debug {pull}25274[25274]
- Delay the restart of application when a status report of failure is given {pull}25339[25339]

==== New features

Expand Down
2 changes: 1 addition & 1 deletion x-pack/elastic-agent/pkg/agent/operation/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func getTestOperator(t *testing.T, downloadPath string, installPath string, p *a
MaxDelay: 10 * time.Second,
},
ProcessConfig: &process.Config{
FailureTimeout: 1, // restart instantly
FailureTimeout: 1, // restart instantly
},
DownloadConfig: &artifact.Config{
TargetDirectory: downloadPath,
Expand Down
8 changes: 4 additions & 4 deletions x-pack/elastic-agent/pkg/core/process/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import "time"

// Config for fine tuning new process
type Config struct {
SpawnTimeout time.Duration `yaml:"spawn_timeout" config:"spawn_timeout"`
StopTimeout time.Duration `yaml:"stop_timeout" config:"stop_timeout"`
SpawnTimeout time.Duration `yaml:"spawn_timeout" config:"spawn_timeout"`
StopTimeout time.Duration `yaml:"stop_timeout" config:"stop_timeout"`
FailureTimeout time.Duration `yaml:"failure_timeout" config:"failure_timeout"`

// TODO: cgroups and namespaces
Expand All @@ -18,8 +18,8 @@ type Config struct {
// DefaultConfig creates a config with pre-set default values.
func DefaultConfig() *Config {
return &Config{
SpawnTimeout: 30 * time.Second,
StopTimeout: 30 * time.Second,
SpawnTimeout: 30 * time.Second,
StopTimeout: 30 * time.Second,
FailureTimeout: 10 * time.Second,
}
}

0 comments on commit 377e45e

Please sign in to comment.