github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +00:00
Code Issues Projects Releases Wiki Activity

cmd: Unify Logging for packet backend

Browse Source 
Be less verbose when running.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-08-15 14:29:30 +01:00
parent 2590c66511
commit 7ae9fab6b6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cmd/linuxkit/run_packet.go
View File

@ -114,7 +114,7 @@ func runPacket(args []string) {
fs := serveFiles{[]string{fmt.Sprintf("%s-kernel", name), fmt.Sprintf("%s-initrd.img", name)}}
httpServer = &http.Server{Addr: ":8080", Handler: http.FileServer(fs)}
go func() {
log.Infof("Listening on http://%s\n", *serveFlag)
log.Debugf("Listening on http://%s\n", *serveFlag)
if err := httpServer.ListenAndServe(); err != nil {
log.Infof("http server exited with: %v", err)
}
@ -161,9 +161,10 @@ func runPacket(args []string) {
if err != nil {
log.Fatal(err)
}
// log response json if in verbose mode
log.Debugf("%s\n", string(b))
log.Printf("Machine booting...")
sshHost := "sos." + dev.Facility.Code + ".packet.net"
if *consoleFlag {
// Connect to the serial console
@ -171,7 +172,6 @@ func runPacket(args []string) {
log.Fatal(err)
}
} else {
log.Printf("Machine booting")
log.Printf("Access the console with: ssh %s@%s", dev.ID, sshHost)
// if the serve option is present, wait till 'ctrl-c' is hit.
@ -186,7 +186,7 @@ func runPacket(args []string) {
// Stop the http server before exiting
if *serveFlag != "" {
log.Printf("Shutting down http server...")
log.Debugf("Shutting down http server...")
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
httpServer.Shutdown(ctx)
@ -202,7 +202,7 @@ func runPacket(args []string) {
// validateHTTPURL does a sanity check that a URL returns a 200 or 300 response
func validateHTTPURL(url string) {
log.Printf("Validating URL: %s", url)
log.Infof("Validating URL: %s", url)
resp, err := http.Head(url)
if err != nil {
log.Fatal(err)
@ -210,11 +210,11 @@ func validateHTTPURL(url string) {
if resp.StatusCode >= 400 {
log.Fatal("Got a non 200- or 300- HTTP response code: %s", resp)
}
log.Printf("OK: %d response code", resp.StatusCode)
log.Debugf("OK: %d response code", resp.StatusCode)
}
func sshSOS(user, host string) error {
log.Printf("console: ssh %s@%s", user, host)
log.Debugf("console: ssh %s@%s", user, host)
hostKey, err := sshHostKey(host)
if err != nil {
@ -340,7 +340,7 @@ func (fs serveFiles) Open(name string) (http.File, error) {
if err != nil {
return nil, err
}
log.Infof("Serving: %s", fn)
log.Debugf("Serving: %s", fn)
return f, nil
}
}