Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 08:44:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix log output of the version string. (#910)

Browse Source 
Split version string into two, before:
```
2017/08/12 19:43:08 [INFO] CoreDNS-010
linux/amd64, go1.8.3, a6d2d7b5
CoreDNS-010
linux/amd64, go1.8.3, a6d2d7b5
```
After:
```
root@9bd51ffc39aa:/go/src/github.com/coredns/coredns# ./coredns
.:53
2017/08/12 19:12:59 [INFO] CoreDNS-010
2017/08/12 19:12:59 [INFO] linux/amd64, go1.8, a6d2d7b
CoreDNS-010
linux/amd64, go1.8, a6d2d7b
```

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang
2017-08-12 12:59:28 -07:00
committed by Miek Gieben
parent a6d2d7b5f7
commit c0d435d4e8
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
coremain/run.go
View File

@@ -156,11 +156,15 @@ func defaultLoader(serverType string) (caddy.Input, error) {
} }
// logVersion logs the version that is starting. // logVersion logs the version that is starting.
func logVersion() { log.Print("[INFO] " + versionString()) } func logVersion() {
log.Print("[INFO] " + versionString())
log.Print("[INFO] " + releaseString())
}
// showVersion prints the version that is starting. // showVersion prints the version that is starting.
func showVersion() { func showVersion() {
fmt.Print(versionString()) fmt.Print(versionString())
fmt.Print(releaseString())
if devBuild && gitShortStat != "" { if devBuild && gitShortStat != "" {
fmt.Printf("%s\n%s\n", gitShortStat, gitFilesModified) fmt.Printf("%s\n%s\n", gitShortStat, gitFilesModified)
} }
@@ -168,7 +172,15 @@ func showVersion() {
// versionString returns the CoreDNS version as a string. // versionString returns the CoreDNS version as a string.
func versionString() string { func versionString() string {
return fmt.Sprintf("%s-%s\n%s/%s, %s, %s\n", caddy.AppName, caddy.AppVersion, runtime.GOOS, runtime.GOARCH, runtime.Version(), gitCommit) return fmt.Sprintf("%s-%s\n", caddy.AppName, caddy.AppVersion)
}
// releaseString returns the release information related to CoreDNS version:
// <OS>/<ARCH>, <go version>, <commit>
// e.g.,
// linux/amd64, go1.8.3, a6d2d7b5
func releaseString() string {
return fmt.Sprintf("%s/%s, %s, %s\n", runtime.GOOS, runtime.GOARCH, runtime.Version(), gitCommit)
} }
// setVersion figures out the version information // setVersion figures out the version information