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

Don't call INI merging code

Browse Source
This commit is contained in:
Arthur Barr
2019-09-19 09:35:57 +01:00
committed by Stephen D Marshall
parent de298a4aad
commit ac50d46c78
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/runmqserver/main.go
View File

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