Merge "third_party/go/kubernetes: fix version reported in kubectl"
diff --git a/go/statusz/statusz.go b/go/statusz/statusz.go
index 84f7f92..4d85477 100644
--- a/go/statusz/statusz.go
+++ b/go/statusz/statusz.go
@@ -38,6 +38,7 @@
"html"
"html/template"
"io"
+ "log"
"net/http"
"os"
"os/user"
@@ -197,9 +198,11 @@
user, err := user.Current()
if err != nil {
- glog.Fatalf("user.Current: %v", err)
+ log.Printf("user.Current: %v", err)
+ username = "UNKNOWN"
+ } else {
+ username = fmt.Sprintf("%s (%s)", user.Username, user.Uid)
}
- username = fmt.Sprintf("%s (%s)", user.Username, user.Uid)
exec, err := os.Executable()
if err == nil {