Skip to content
This repository has been archived by the owner on Sep 19, 2022. It is now read-only.

Minor change in log #213

Merged
merged 6 commits into from
Sep 3, 2019
Merged

Minor change in log #213

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b00dcc
Compatible with upstream changes
johnugeorge Sep 3, 2018
0092437
Merge branch 'upstream'
johnugeorge Jul 16, 2019
6ecb43b
Merge remote-tracking branch 'upstream/master'
johnugeorge Aug 1, 2019
27d4cdc
Merge remote-tracking branch 'upstream/master'
johnugeorge Aug 11, 2019
c966f9e
Format error logs
johnugeorge Aug 31, 2019
8335049
Merge remote-tracking branch 'upstream/master' into logs
johnugeorge Aug 31, 2019
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
3 changes: 2 additions & 1 deletion pkg/common/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ var initContainerTemplate = `
func init() {
bytes, err := ioutil.ReadFile("/etc/config/initContainer.yaml")
if err != nil {
log.Warningf("error while read initContainerTemplate, use default. error: %s", err)
log.Info("Using default init container template")
} else {
log.Info("Using init container template from /etc/config/initContainer.yaml")
initContainerTemplate = string(bytes)
}
}
Expand Down