From ee0ef9105401c326c7729f63a4aa322d72d94eb4 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 28 Sep 2022 13:50:21 +0200
Subject: [PATCH] L2SS-989: Tell docker our Tango devices are to be shutdown
using SIGINT
---
docker-compose/device-antennafield.yml | 2 ++
docker-compose/device-apsct.yml | 2 ++
docker-compose/device-apspu.yml | 2 ++
docker-compose/device-beamlet.yml | 2 ++
docker-compose/device-boot.yml | 2 ++
docker-compose/device-bst.yml | 2 ++
docker-compose/device-ccd.yml | 2 ++
docker-compose/device-digitalbeam.yml | 2 ++
docker-compose/device-docker.yml | 2 ++
docker-compose/device-observation-control.yml | 2 ++
docker-compose/device-observation.yml | 2 ++
docker-compose/device-pcon.yml | 2 ++
docker-compose/device-psoc.yml | 2 ++
docker-compose/device-recv.yml | 2 ++
docker-compose/device-sdp.yml | 2 ++
docker-compose/device-sst.yml | 2 ++
docker-compose/device-temperature-manager.yml | 2 ++
docker-compose/device-tilebeam.yml | 2 ++
docker-compose/device-unb2.yml | 2 ++
docker-compose/device-xst.yml | 2 ++
20 files changed, 40 insertions(+)
diff --git a/docker-compose/device-antennafield.yml b/docker-compose/device-antennafield.yml
index ec08ce0f2..1227a4b32 100644
--- a/docker-compose/device-antennafield.yml
+++ b/docker-compose/device-antennafield.yml
@@ -50,3 +50,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-antennafield AntennaField STAT -v -ORBendPoint giop:tcp:0:5715 -ORBendPointPublish giop:tcp:${HOSTNAME}:5715
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-apsct.yml b/docker-compose/device-apsct.yml
index 024ca9422..6cf44394a 100644
--- a/docker-compose/device-apsct.yml
+++ b/docker-compose/device-apsct.yml
@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-apsct Apsct STAT -v -v -ORBendPoint giop:tcp:device-apsct:5709 -ORBendPointPublish giop:tcp:${HOSTNAME}:5709
restart: on-failure
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-apspu.yml b/docker-compose/device-apspu.yml
index e70df9a1b..fd9f8942f 100644
--- a/docker-compose/device-apspu.yml
+++ b/docker-compose/device-apspu.yml
@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-apspu Apspu STAT -v -ORBendPoint giop:tcp:device-apspu:5710 -ORBendPointPublish giop:tcp:${HOSTNAME}:5710
restart: on-failure
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-beamlet.yml b/docker-compose/device-beamlet.yml
index 27dcc8020..3094b64b5 100644
--- a/docker-compose/device-beamlet.yml
+++ b/docker-compose/device-beamlet.yml
@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-beamlet Beamlet STAT -v -ORBendPoint giop:tcp:0:5712 -ORBendPointPublish giop:tcp:${HOSTNAME}:5712
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-boot.yml b/docker-compose/device-boot.yml
index ae17797e7..2e9f8aa9d 100644
--- a/docker-compose/device-boot.yml
+++ b/docker-compose/device-boot.yml
@@ -48,3 +48,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-boot Boot STAT -v -ORBendPoint giop:tcp:0:5708 -ORBendPointPublish giop:tcp:${HOSTNAME}:5708
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-bst.yml b/docker-compose/device-bst.yml
index 9655beb47..64be2362d 100644
--- a/docker-compose/device-bst.yml
+++ b/docker-compose/device-bst.yml
@@ -52,3 +52,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-bst BST STAT -v -ORBendPoint giop:tcp:0:5717 -ORBendPointPublish giop:tcp:${HOSTNAME}:5717
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-ccd.yml b/docker-compose/device-ccd.yml
index 7531012fd..ad53c0afa 100644
--- a/docker-compose/device-ccd.yml
+++ b/docker-compose/device-ccd.yml
@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-ccd Ccd STAT -v -ORBendPoint giop:tcp:device-ccd:5721 -ORBendPointPublish giop:tcp:${HOSTNAME}:5721
restart: on-failure
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-digitalbeam.yml b/docker-compose/device-digitalbeam.yml
index 36801cd02..3e4424dee 100644
--- a/docker-compose/device-digitalbeam.yml
+++ b/docker-compose/device-digitalbeam.yml
@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-digitalbeam DigitalBeam STAT -v -ORBendPoint giop:tcp:0:5713 -ORBendPointPublish giop:tcp:${HOSTNAME}:5713
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-docker.yml b/docker-compose/device-docker.yml
index c531ac63b..0d3935796 100644
--- a/docker-compose/device-docker.yml
+++ b/docker-compose/device-docker.yml
@@ -51,3 +51,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-docker-device Docker STAT -v -ORBendPoint giop:tcp:0:5705 -ORBendPointPublish giop:tcp:${HOSTNAME}:5705
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-observation-control.yml b/docker-compose/device-observation-control.yml
index 42b9e48a9..3eb2e4cdd 100644
--- a/docker-compose/device-observation-control.yml
+++ b/docker-compose/device-observation-control.yml
@@ -48,3 +48,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-observation-control ObservationControl STAT -v -ORBendPoint giop:tcp:0:5703 -ORBendPointPublish giop:tcp:${HOSTNAME}:5703
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-observation.yml b/docker-compose/device-observation.yml
index 48bb75393..a002d06f4 100644
--- a/docker-compose/device-observation.yml
+++ b/docker-compose/device-observation.yml
@@ -47,3 +47,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-observation Observation STAT -v -ORBendPoint giop:tcp:0:5718 -ORBendPointPublish giop:tcp:${HOSTNAME}:5718
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-pcon.yml b/docker-compose/device-pcon.yml
index 1c8140aaa..3165b6ee0 100644
--- a/docker-compose/device-pcon.yml
+++ b/docker-compose/device-pcon.yml
@@ -44,3 +44,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-pcon pcon STAT -v -ORBendPoint giop:tcp:device-pcon:5720 -ORBendPointPublish giop:tcp:${HOSTNAME}:5720
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-psoc.yml b/docker-compose/device-psoc.yml
index b493627aa..25e33b3b2 100644
--- a/docker-compose/device-psoc.yml
+++ b/docker-compose/device-psoc.yml
@@ -44,3 +44,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-psoc PSOC STAT -v -ORBendPoint giop:tcp:device-psoc:5719 -ORBendPointPublish giop:tcp:${HOSTNAME}:5719
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-recv.yml b/docker-compose/device-recv.yml
index 134c2ccb4..bec614c9b 100644
--- a/docker-compose/device-recv.yml
+++ b/docker-compose/device-recv.yml
@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-receiver RECV STAT -v -ORBendPoint giop:tcp:device-recv:5707 -ORBendPointPublish giop:tcp:${HOSTNAME}:5707
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml
index 61f8eb341..e3691921c 100644
--- a/docker-compose/device-sdp.yml
+++ b/docker-compose/device-sdp.yml
@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-sdp SDP STAT -v -ORBendPoint giop:tcp:device-sdp:5701 -ORBendPointPublish giop:tcp:${HOSTNAME}:5701
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-sst.yml b/docker-compose/device-sst.yml
index 5db68a00c..53d24c8fe 100644
--- a/docker-compose/device-sst.yml
+++ b/docker-compose/device-sst.yml
@@ -52,3 +52,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-sst SST STAT -v -ORBendPoint giop:tcp:0:5702 -ORBendPointPublish giop:tcp:${HOSTNAME}:5702
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-temperature-manager.yml b/docker-compose/device-temperature-manager.yml
index eb87e6e59..8cf747710 100644
--- a/docker-compose/device-temperature-manager.yml
+++ b/docker-compose/device-temperature-manager.yml
@@ -44,3 +44,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-temperature-manager TemperatureManager STAT -v -ORBendPoint giop:tcp:0:5716 -ORBendPointPublish giop:tcp:${HOSTNAME}:5716
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-tilebeam.yml b/docker-compose/device-tilebeam.yml
index c8665d568..fcc4eefb4 100644
--- a/docker-compose/device-tilebeam.yml
+++ b/docker-compose/device-tilebeam.yml
@@ -45,3 +45,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-tilebeam TileBeam STAT -v -ORBendPoint giop:tcp:0:5711 -ORBendPointPublish giop:tcp:${HOSTNAME}:5711
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-unb2.yml b/docker-compose/device-unb2.yml
index cbb31b0ef..9727d72c1 100644
--- a/docker-compose/device-unb2.yml
+++ b/docker-compose/device-unb2.yml
@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-unb2 UNB2 STAT -v -ORBendPoint giop:tcp:device-unb2:5704 -ORBendPointPublish giop:tcp:${HOSTNAME}:5704
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
diff --git a/docker-compose/device-xst.yml b/docker-compose/device-xst.yml
index cdceac715..44b61c734 100644
--- a/docker-compose/device-xst.yml
+++ b/docker-compose/device-xst.yml
@@ -52,3 +52,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-xst XST STAT -v -ORBendPoint giop:tcp:0:5706 -ORBendPointPublish giop:tcp:${HOSTNAME}:5706
restart: unless-stopped
+ stop_signal: SIGINT # request a graceful shutdown of Tango
+ stop_grace_period: 2s
--
GitLab