strip \r and \n when reading the file /etc/host_hostname #338
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@nvanheuverzwijn comments welcomed here |
josegonzalez
approved these changes
Oct 13, 2017
|
@michaelshobbs Thank you Michael, I appreciate your work greatly ! Have an excellent day. |
markdascher
reviewed
Aug 31, 2018
| func getHostname() string { | ||
| content, err := ioutil.ReadFile("/etc/host_hostname") | ||
| if err == nil && len(content) > 0 { | ||
| hostname = strings.TrimRight(string(content), "\r\n") |
There was a problem hiding this comment.
This modifies the global hostname variable. Should we add a local declaration at the beginning of getHostname? (Or just return here instead of assigning the result?)
| if err == nil && len(content) > 0 { | ||
| hostname = strings.TrimRight(string(content), "\r\n") | ||
| } else { | ||
| hostname = getopt("SYSLOG_HOSTNAME", "{{.Container.Config.Hostname}}") |
| @@ -69,13 +80,8 @@ func NewSyslogAdapter(route *router.Route) (router.LogAdapter, error) { | |||
| format := getopt("SYSLOG_FORMAT", "rfc5424") | |||
| priority := getopt("SYSLOG_PRIORITY", "{{.Priority}}") | |||
| pid := getopt("SYSLOG_PID", "{{.Container.State.Pid}}") | |||
| hostname = getHostname() | |||
There was a problem hiding this comment.
I think this would make more sense as := too.
|
@markdascher please file a new issue, rather than posting on an old pull request. |
# for free
to subscribe to this conversation on GitHub.
Already have an account?
#.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
also:
working_directoryso we don't have duplicate packagesalpine:3.6in order to get golang 1.8.3DEBUGto test containercloses #335