Skip to content

Remove SIGTERM handler override in AM gather and send plugins #1653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robjarawan wants to merge 3 commits into
base: development
Choose a base branch
from
+6 −8
Open

Remove SIGTERM handler override in AM gather and send plugins #1653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f7f415
Remove SIGTERM handler override in AM gather and send plugins
robjarawan Mar 30, 2026
cdf773c
Merge branch 'development' into fix/am-sigterm-handler-override
robjarawan Apr 13, 2026
3192368
Merge branch 'development' into fix/am-sigterm-handler-override
robjarawan Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions sarracenia/flowcb/gather/am.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
André LeBlanc, ANL, Autumn 2022
"""

import logging, socket, struct, time, sys, os, signal, ipaddress, urllib.parse, getpass, psutil
import logging, socket, struct, time, sys, os, ipaddress, urllib.parse, getpass, psutil
import re
from base64 import b64encode
from random import randint
Expand Down Expand Up @@ -113,9 +113,8 @@ def __init__(self, options):
self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)

# Add signal handler
## Override outer signal handler with a default one to exit correctly.
signal.signal(signal.SIGTERM, signal.SIG_DFL)
# Let the parent flow's signal handler manage graceful shutdown.
# Previously overrode with SIG_DFL which bypassed all cleanup.


def __WaitForRemoteConnections__(self) -> NoReturn:
Expand Down
7 changes: 3 additions & 4 deletions sarracenia/flowcb/send/am.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
André LeBlanc, ANL, Autumn 2022
"""

import logging, socket, struct, time, signal, sys, os
import logging, socket, struct, time, sys, os
import urllib.parse
from sarracenia.flowcb import FlowCB

Expand Down Expand Up @@ -63,9 +63,8 @@ def __init__(self, options):
self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 2)

# Add signal handler
## Override outer signal handler with a default one to exit correctly.
signal.signal(signal.SIGTERM, signal.SIG_DFL)
# Let the parent flow's signal handler manage graceful shutdown.
# Previously overrode with SIG_DFL which bypassed all cleanup.


def wrapbulletin(self, sarra_msg):
Expand Down
Loading