Skip to content

Add socket/service files for running per-connection mdsip servers with systemd #2510

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

Merged
joshStillerman merged 1 commit into from
Jan 30, 2023
Merged

Add socket/service files for running per-connection mdsip servers with systemd #2510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions deploy/packaging/debian/kernel.noarch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
./usr/local/mdsplus/pixmaps/tdi.png
./usr/local/mdsplus/rpm/mdsipd.xinetd
./usr/local/mdsplus/rpm/mdsipsd.xinetd
./usr/local/mdsplus/rpm/mdsip.socket
./usr/local/mdsplus/rpm/mdsip@.service
./usr/local/mdsplus/rpm/post_install_script
./usr/local/mdsplus/rpm/post_uninstall_script
./usr/local/mdsplus/rpm/python_module_install.sh
Expand Down
8 changes: 8 additions & 0 deletions deploy/packaging/linux.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,14 @@ then
then
echo 'mdsip 8000/tcp # MDSplus mdsip service' >> /etc/services
fi
fi
if [ ! -r /etc/systemd/system/mdsip.socket ]
then
cp $RPM_INSTALL_PREFIX/mdsplus/rpm/mdsip.socket /etc/systemd/system/mdsip.socket
fi
if [ ! -r /etc/systemd/system/mdsip@.service ]
then
cp $RPM_INSTALL_PREFIX/mdsplus/rpm/mdsip@.service /etc/systemd/system/mdsip@.service
fi
</post>
<preun>
Expand Down
2 changes: 2 additions & 0 deletions deploy/packaging/redhat/kernel.noarch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
./usr/local/mdsplus/rpm
./usr/local/mdsplus/rpm/mdsipd.xinetd
./usr/local/mdsplus/rpm/mdsipsd.xinetd
./usr/local/mdsplus/rpm/mdsip.socket
./usr/local/mdsplus/rpm/mdsip@.service
./usr/local/mdsplus/rpm/post_install_script
./usr/local/mdsplus/rpm/post_uninstall_script
./usr/local/mdsplus/rpm/python_module_install.sh
Expand Down
2 changes: 1 addition & 1 deletion rpm/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ dist_rpm_SCRIPTS = post_install_script python_module_install.sh python_module_re
if GLOBUSLICENSE
dist_rpm_DATA = fusiongrid-mdsip.xinetd fusiongrid-mdsips.xinetd globus-gatekeeper.xinetd globus-gridftp.xinetd
else
dist_rpm_DATA = mdsipd.xinetd mdsipsd.xinetd
dist_rpm_DATA = mdsipd.xinetd mdsipsd.xinetd mdsip.socket mdsip@.service
endif
13 changes: 13 additions & 0 deletions rpm/mdsip.socket
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[Unit]
Description=MDSplus Socket for Per-Connection Servers

[Socket]
Accept=yes
KeepAlive=true
NoDelay=true
# If we don't force IPv4, the addresses come in from 0.0.0.0 and the host mapping breaks
# Service names don't work here, so we have to use 8000 instead of mdsip
ListenStream=0.0.0.0:8000

[Install]
WantedBy=sockets.target
10 changes: 10 additions & 0 deletions rpm/mdsip@.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Unit]
Description=MDSplus Per-Connection Server

[Service]
User=root
Type=forking
# NOTE: If you installed MDSplus to a different location, make sure you change the following line
ExecStart=/usr/local/mdsplus/bin/mdsipd mdsip /var/log/mdsplus/mdsipd
# This spawns the process inetd-style with the incoming socket bound to stdin
StandardInput=socket