Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly initialize seelog #2644

Merged
merged 1 commit into from
Oct 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ import (
"time"

"github.com/aws/amazon-ecs-agent/agent/app"
"github.com/aws/amazon-ecs-agent/agent/logger"
)

func init() {
rand.Seed(time.Now().UnixNano())
}

func main() {
logger.InitSeelog()
os.Exit(app.Run(os.Args[1:]))
}
2 changes: 2 additions & 0 deletions agent/logger/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,9 @@ func init() {
MaxFileSizeMB: DEFAULT_MAX_FILE_SIZE,
MaxRollCount: DEFAULT_MAX_ROLL_COUNT,
}
}

func InitSeelog() {
if err := seelog.RegisterCustomFormatter("EcsAgentLogfmt", logfmtFormatter); err != nil {
seelog.Error(err)
}
Expand Down
23 changes: 23 additions & 0 deletions agent/logger/log_init_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// +build unit integration

// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License"). You may
// not use this file except in compliance with the License. A copy of the
// License is located at
//
// http://aws.amazon.com/apache2.0/
//
// or in the "license" file accompanying this file. This file is distributed
// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
// express or implied. See the License for the specific language governing
// permissions and limitations under the License.

package logger

func init() {
// We don't want to call InitSeelog automatically (e.g. calling it from init())
// because some internal clients use ECS Agent as a library.
// However we want to call InitSeelog automatically from all tests.
InitSeelog()
}