Enable INI merging

This commit is contained in:
Arthur Barr
2019-09-30 14:04:08 +01:00
committed by Stephen D Marshall
parent 65edac267e
commit 68ad98fc49

View File

@@ -25,6 +25,7 @@ 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"
@@ -176,11 +177,11 @@ func doMain() error {
return err
}
// err = mqinimerge.AddStanzas(name)
// if err != nil {
// logTermination(err)
// return err
// }
err = mqinimerge.AddStanzas(name)
if err != nil {
logTermination(err)
return err
}
err = startQueueManager(name)
if err != nil {