When pushed, this commit will replace hard-coded values with calls to LookupMQM

This commit is contained in:
Stephen Marshall
2018-04-25 14:09:23 +01:00
parent bf36f8bb2c
commit 3aa46e0793
6 changed files with 42 additions and 33 deletions

View File

@@ -17,28 +17,12 @@ package main
import (
"os"
"os/user"
"path/filepath"
"runtime"
"strconv"
"syscall"
)
func lookupMQM() (int, int, error) {
mqm, err := user.Lookup("mqm")
if err != nil {
return -1, -1, err
}
mqmUID, err := strconv.Atoi(mqm.Uid)
if err != nil {
return -1, -1, err
}
mqmGID, err := strconv.Atoi(mqm.Gid)
if err != nil {
return -1, -1, err
}
return mqmUID, mqmGID, nil
}
"github.com/ibm-messaging/mq-container/internal/command"
)
func createVolume(path string) error {
dataPath := filepath.Join(path, "data")
@@ -60,7 +44,7 @@ func createVolume(path string) error {
sys := fi.Sys()
if sys != nil && runtime.GOOS == "linux" {
stat := sys.(*syscall.Stat_t)
mqmUID, mqmGID, err := lookupMQM()
mqmUID, mqmGID, err := command.LookupMQM()
if err != nil {
return err
}

View File

@@ -78,7 +78,7 @@ func configureWebServer() error {
}
return err
}
uid, gid, err := lookupMQM()
uid, gid, err := command.LookupMQM()
if err != nil {
return err
}