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

Update UBI/Go and add buffer to signals

Browse Source
This commit is contained in:
Tom Jefferson
2022-05-12 16:59:45 +01:00
parent bf3d8dd26d
commit 4e26150542
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -18,7 +18,7 @@ sudo: required
language: go language: go
go: go:
- "1.16.12" - "1.17.7"
services: services:
- docker - docker

4
Dockerfile-server
View File

@@ -13,9 +13,9 @@
# limitations under the License. # limitations under the License.
ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal
ARG BASE_TAG=8.5-243.1651231653 ARG BASE_TAG=8.6-751
ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset
ARG BUILDER_TAG=1.16.12-10 ARG BUILDER_TAG=1.17.7-13
ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container
ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.3.0.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.3.0.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"
############################################################################### ###############################################################################

6
cmd/runmqserver/signals.go
View File

@@ -1,5 +1,5 @@
/* /*
© Copyright IBM Corporation 2017, 2018 © Copyright IBM Corporation 2017, 2022
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@@ -33,8 +33,8 @@ func signalHandler(qmgr string) chan int {
control := make(chan int) control := make(chan int)
// Use separate channels for the signals, to avoid SIGCHLD signals swamping // Use separate channels for the signals, to avoid SIGCHLD signals swamping
// the buffer, and preventing other signals. // the buffer, and preventing other signals.
stopSignals := make(chan os.Signal) stopSignals := make(chan os.Signal, 1)
reapSignals := make(chan os.Signal) reapSignals := make(chan os.Signal, 1)
signal.Notify(stopSignals, syscall.SIGTERM, syscall.SIGINT) signal.Notify(stopSignals, syscall.SIGTERM, syscall.SIGINT)
go func() { go func() {
for { for {