Skip to content

Commit 23f31b1

Browse files
committed
updating to use mqversion util
1 parent 8d16434 commit 23f31b1

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

cmd/runmqserver/qmgr.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"github.com/ibm-messaging/mq-container/internal/command"
2828
containerruntime "github.com/ibm-messaging/mq-container/internal/containerruntime"
2929
"github.com/ibm-messaging/mq-container/internal/mqscredact"
30+
"github.com/ibm-messaging/mq-container/internal/mqversion"
3031
"github.com/ibm-messaging/mq-container/internal/ready"
3132
)
3233

@@ -204,13 +205,16 @@ func getQueueManagerDataDir(mounts map[string]string, name string) string {
204205

205206
func getCreateQueueManagerArgs(mounts map[string]string, name string, devMode bool) []string {
206207

207-
// use "UserExternal" only if we are 9.2.0.1 or above.
208-
mqVersion, _, err := command.Run("dspmqver", "-b", "-f", "2")
208+
mqversionBase := "9.2.0.0"
209+
210+
// use "UserExternal" only if we are 9.2.1.0 or above.
211+
oaVal := "user"
212+
mqVersionCheck, err := mqversion.Compare(mqversionBase)
213+
209214
if err != nil {
210-
log.Printf("Error Getting MQ version to find oa: %v", strings.TrimSuffix(string(mqVersion), "\n"))
215+
log.Printf("Error comparing MQ versions for oa,rc: %v", mqVersionCheck)
211216
}
212-
oaVal := "user"
213-
if mqVersion > "9.2.0.0" {
217+
if mqVersionCheck > 0 {
214218
oaVal = "UserExternal"
215219
}
216220

0 commit comments

Comments
 (0)