academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added docker tests to test the new crtmqm -ii option (#50)

Browse Source 
* Added docker tests to test the new crtmqm -ii option, removed the old ini merging code

* Fixed issues with docket tests for ctrqmq -ii

* Removed unneeded logging
This commit is contained in:
Amrit K Kandola
2019-12-12 10:56:27 +00:00
committed by GitHub Enterprise
parent 28b723d6cf
commit 140db42675
10 changed files with 182 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/runmqserver/main.go
View File

@@ -25,7 +25,6 @@ import (
"sync"
"github.com/ibm-messaging/mq-container/internal/metrics"
"github.com/ibm-messaging/mq-container/internal/mqinimerge"
"github.com/ibm-messaging/mq-container/internal/ready"
"github.com/ibm-messaging/mq-container/internal/tls"
"github.com/ibm-messaging/mq-container/pkg/containerruntimelogger"
@@ -177,12 +176,6 @@ func doMain() error {
return err
}
err = mqinimerge.AddStanzas(name)
if err != nil {
logTermination(err)
return err
}
err = startQueueManager(name)
if err != nil {
logTermination(err)

2
cmd/runmqserver/qmgr.go
View File

@@ -228,7 +228,7 @@ func getQueueManagerDataDir(mounts map[string]string, name string) string {
}
func getCreateQueueManagerArgs(mounts map[string]string, name string) []string {
args := []string{"-q", "-p", "1414"}
args := []string{"-ii", "/etc/mqm/", "-q", "-p", "1414"}
if _, ok := mounts["/mnt/mqm-log"]; ok {
args = append(args, "-ld", "/mnt/mqm-log/log")
}