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

Renamed environement variable to MQ_GRACE_PERIOD

Browse Source
This commit is contained in:
Nicholas-Daffern
2019-12-18 09:24:05 +00:00
committed by Stephen D Marshall
parent 88bcaaecc3
commit 2cbad648b9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile-server
View File

@@ -99,7 +99,7 @@ RUN chmod ug+x /usr/local/bin/runmqserver \
&& chmod 0660 /run/termination-log && chmod 0660 /run/termination-log
# Always use port 1414 for MQ & 9157 for the metrics # Always use port 1414 for MQ & 9157 for the metrics
EXPOSE 1414 9157 9443 EXPOSE 1414 9157 9443
ENV QMGRACEPERIOD=30 ENV MQ_GRACE_PERIOD=30
ENV LANG=en_US.UTF-8 AMQ_DIAGNOSTIC_MSG_SEVERITY=1 AMQ_ADDITIONAL_JSON_LOG=1 LOG_FORMAT=basic ENV LANG=en_US.UTF-8 AMQ_DIAGNOSTIC_MSG_SEVERITY=1 AMQ_ADDITIONAL_JSON_LOG=1 LOG_FORMAT=basic
USER $MQM_UID USER $MQM_UID
ENTRYPOINT ["runmqserver"] ENTRYPOINT ["runmqserver"]

2
cmd/runmqserver/qmgr.go
View File

@@ -173,7 +173,7 @@ func configureQueueManager() error {
func stopQueueManager(name string) error { func stopQueueManager(name string) error {
log.Println("Stopping queue manager") log.Println("Stopping queue manager")
qmGracePeriod := os.Getenv("QMGRACEPERIOD") qmGracePeriod := os.Getenv("MQ_GRACE_PERIOD")
isStandby, err := ready.IsRunningAsStandbyQM(name) isStandby, err := ready.IsRunningAsStandbyQM(name)
if err != nil { if err != nil {
log.Printf("Error getting status for queue manager %v: %v", name, err.Error()) log.Printf("Error getting status for queue manager %v: %v", name, err.Error())

2
test/docker/docker_api_test.go
View File

@@ -84,7 +84,7 @@ func TestEndMQMOpts(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
containerConfig := container.Config{ containerConfig := container.Config{
Env: []string{"LICENSE=accept", "QMGRACEPERIOD=27"}, Env: []string{"LICENSE=accept", "MQ_GRACE_PERIOD=27"},
} }
id := runContainer(t, cli, &containerConfig) id := runContainer(t, cli, &containerConfig)