From 7efcef67e0cca5ab93532d739e368a0516974442 Mon Sep 17 00:00:00 2001
From: Arthur Barr <arthur.barr@uk.ibm.com>
Date: Mon, 30 Oct 2017 16:04:26 +0000
Subject: [PATCH] Log user

---
 cmd/runmqserver/mqconfig.go | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/cmd/runmqserver/mqconfig.go b/cmd/runmqserver/mqconfig.go
index a60f8df..c66fc55 100644
--- a/cmd/runmqserver/mqconfig.go
+++ b/cmd/runmqserver/mqconfig.go
@@ -18,6 +18,7 @@ package main
 import (
 	"io/ioutil"
 	"log"
+	"os/user"
 	"runtime"
 	"strings"
 
@@ -54,6 +55,13 @@ func logBaseImage() error {
 	return nil
 }
 
+func logUser() {
+	u, err := user.Current()
+	if err == nil {
+		log.Printf("Running as user ID %v (%v) with primary group %v", u.Uid, u.Name, u.Gid)
+	}
+}
+
 func readProc(filename string) (value string, err error) {
 	buf, err := ioutil.ReadFile(filename)
 	if err != nil {
@@ -106,13 +114,6 @@ func checkFS(path string) {
 
 func logConfig() {
 	log.Printf("CPU architecture: %v", runtime.GOARCH)
-	// TODO: You can't use os.user if you're cross-compiling
-	// u, err := user.Current()
-	// if err != nil {
-	// 	log.Println(err)
-	// } else {
-	// 	log.Printf("Running as user ID %v (%v) with primary group %v", u.Uid, u.Name, u.Gid)
-	// }
 	if runtime.GOOS == "linux" {
 		var err error
 		osr, err := readProc("/proc/sys/kernel/osrelease")
@@ -128,6 +129,7 @@ func logConfig() {
 		} else {
 			log.Printf("Maximum file handles: %v", fileMax)
 		}
+		logUser()
 		readMounts()
 	} else {
 		log.Fatalf("Unsupported platform: %v", runtime.GOOS)