TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 4 Projects Releases Packages Wiki Activity Actions

startup: add logo (#3230)

Browse source 
* startup: add logo

As discussed in #3225, lets add a little logo. This PR incorperates this
in the startup text. It also removes the logging output as this outputs
identical lines of text, but for no clear reason. This means --quiet now
means "no output on startup at all".

Currently it looks like this:

~~~
.:1053
   ______                ____  _   _______
  / ____/___  ________  / __ \/ | / / ___/	CoreDNS-1.6.2
 / /   / __ \/ ___/ _ \/ / / /  |/ /\__ \ 	linux/amd64, go1.12.9,
/ /___/ /_/ / /  /  __/ /_/ / /|  /___/ /
\____/\____/_/   \___/_____/_/ |_//____/
~~~

We have 2 lines extra on the right if we need to print more (no ideas
come to mind currently).

Signed-off-by: Miek Gieben <miek@miek.nl>

* Add distinct marker for grep and cut purposes

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben 2019-08-30 15:12:17 +01:00 • committed by GitHub
parent 94930d20ea
commit c466003a94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
coremain/logo.go Normal file
View file

@ -0,0 +1,14 @@
package coremain
// This is CoreDNS' ascii LOGO, nothing fancy. It's generated with:
// figlet -f slant CoreDNS
// We're printing the logo line by line, hence splitting it up.
var logo = []string{
` ______ ____ _ _______`,
` / ____/___ ________ / __ \/ | / / ___/`,
` / / / __ \/ ___/ _ \/ / / / |/ /\__ \ `,
`/ /___/ /_/ / / / __/ /_/ / /| /___/ / `,
`\____/\____/_/ \___/_____/_/ |_//____/ `,
}
const marker = "~ "

17
coremain/run.go
View file

@ -11,7 +11,6 @@ import (
"strings" "strings"
"github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/core/dnsserver"
clog "github.com/coredns/coredns/plugin/pkg/log"
"github.com/caddyserver/caddy" "github.com/caddyserver/caddy"
) )
@ -82,7 +81,6 @@ func Run() {
mustLogFatal(err) mustLogFatal(err)
} }
logVersion()
if !dnsserver.Quiet { if !dnsserver.Quiet {
showVersion() showVersion()
} }
@ -141,24 +139,21 @@ func defaultLoader(serverType string) (caddy.Input, error) {
}, nil }, nil
} }
// logVersion logs the version that is starting. // showVersion prints the version that is starting. We print our logo on the left.
func logVersion() {
clog.Info(versionString())
clog.Info(releaseString())
}
// showVersion prints the version that is starting.
func showVersion() { func showVersion() {
fmt.Println(logo[0])
fmt.Print(versionString()) fmt.Print(versionString())
fmt.Print(releaseString()) 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)
} }
fmt.Println(logo[3])
fmt.Println(logo[4])
} }
// 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", caddy.AppName, caddy.AppVersion) return fmt.Sprintf("%s\t%s%s-%s\n", logo[1], marker, caddy.AppName, caddy.AppVersion)
} }
// releaseString returns the release information related to CoreDNS version: // releaseString returns the release information related to CoreDNS version:
@ -166,7 +161,7 @@ func versionString() string {
// e.g., // e.g.,
// linux/amd64, go1.8.3, a6d2d7b5 // linux/amd64, go1.8.3, a6d2d7b5
func releaseString() string { func releaseString() string {
return fmt.Sprintf("%s/%s, %s, %s\n", runtime.GOOS, runtime.GOARCH, runtime.Version(), GitCommit) return fmt.Sprintf("%s\t%s%s/%s, %s, %s\n", logo[2], marker, runtime.GOOS, runtime.GOARCH, runtime.Version(), GitCommit)
} }
// setVersion figures out the version information // setVersion figures out the version information