增加RPM包安装时, 自动安装sapp.service服务功能.v4.0.3

9 files changed, 101 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cec6bc9..bfa8b46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -169,6 +169,7 @@ add_subdirectory(./src/inner_plug)
 add_subdirectory(./src/timer)
 add_subdirectory(./src/entry)
 add_subdirectory(./test)
+add_subdirectory(./service)
 
 #by default, not include sapp_module_test dir
 #add_subdirectory(./test/sapp_module_test/src)
diff --git a/bin/etc/sapp.toml b/bin/etc/sapp.toml
index a088f7a..88a1ad6 100644
--- a/bin/etc/sapp.toml
+++ b/bin/etc/sapp.toml
@@ -11,7 +11,7 @@ instance_name = "sapp_v4.0"
 [CPU]
 worker_threads=1
 ### note, bind_mask, if you do not want to bind thread to special CPU core, keep it empty as []
-bind_mask=[1,2,3,4]
+bind_mask=[1]
 
 [PACKET_IO]
 ### note, BSD_packet_filter, if you do not want to set any filter rule, keep it empty as ""
@@ -38,7 +38,7 @@ BSD_packet_filter=""
     [stream.tcp]
     max=10000
     timeout=60
-    syn_mandatory=0
+    syn_mandatory=1
     reorder_pkt_max=5
     analyse_option_enabled=1
         [stream.tcp.inject]
diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
new file mode 100644
index 0000000..d5563dc
--- /dev/null
+++ b/service/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+if(CAPTURE_MODE MATCHES "MARSIO")
+    #configure_file(sapp_marsio.service.in sapp.service)
+    install(FILES ${PROJECT_SOURCE_DIR}/service/sapp-env-marsio.service.in DESTINATION /usr/lib/systemd/system/ RENAME sapp-env.service)
+    install(FILES ${PROJECT_SOURCE_DIR}/service/sapp_marsio.service.in DESTINATION /usr/lib/systemd/system/ RENAME sapp.service)
+else()
+    #configure_file(sapp_default.service.in sapp.service)
+    install(FILES ${PROJECT_SOURCE_DIR}/service/sapp-env-default.service.in DESTINATION /usr/lib/systemd/system/ RENAME sapp-env.service)
+    install(FILES ${PROJECT_SOURCE_DIR}/service/sapp_default.service.in DESTINATION /usr/lib/systemd/system/ RENAME sapp.service)
+endif()
+
+install(PROGRAMS ${PROJECT_SOURCE_DIR}/service/setup.sh DESTINATION /opt/sapp/env)
+install(PROGRAMS ${PROJECT_SOURCE_DIR}/service/fake_sapp DESTINATION /opt/sapp/bin)
+
diff --git a/service/fake_sapp b/service/fake_sapp
new file mode 100644
index 0000000..0871d41
--- /dev/null
+++ b/service/fake_sapp
diff --git a/service/sapp-env-default.service.in b/service/sapp-env-default.service.in
new file mode 100644
index 0000000..9c7d986
--- /dev/null
+++ b/service/sapp-env-default.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=set sapp environment
+Requires=network.target
+After=network.target
+Before=sapp.service
+
+[Service]
+ExecStart=/opt/sapp/env/setup.sh
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+RequiredBy=sapp.service
diff --git a/service/sapp-env-marsio.service.in b/service/sapp-env-marsio.service.in
new file mode 100644
index 0000000..d04cb67
--- /dev/null
+++ b/service/sapp-env-marsio.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=set sapp environment
+Requires=mrzcpd.service
+After=mrzcpd.service
+Before=sapp.service
+
+[Service]
+ExecStart=/opt/sapp/env/setup.sh
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+RequiredBy=sapp.service
diff --git a/service/sapp_default.service.in b/service/sapp_default.service.in
new file mode 100644
index 0000000..47e0dfa
--- /dev/null
+++ b/service/sapp_default.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=sapp service
+Requires=sapp-env.service
+After=sapp-env.service
+
+[Service]
+WorkingDirectory=/opt/sapp/bin/
+ExecStart=/opt/sapp/bin/fake_sapp
+Restart=always
+RestartSec=5s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/service/sapp_marsio.service.in b/service/sapp_marsio.service.in
new file mode 100644
index 0000000..47e0dfa
--- /dev/null
+++ b/service/sapp_marsio.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=sapp service
+Requires=sapp-env.service
+After=sapp-env.service
+
+[Service]
+WorkingDirectory=/opt/sapp/bin/
+ExecStart=/opt/sapp/bin/fake_sapp
+Restart=always
+RestartSec=5s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/service/setup.sh b/service/setup.sh
new file mode 100644
index 0000000..e840df1
--- /dev/null
+++ b/service/setup.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+systemctl enable sapp-env
+
+systemctl daemon-reload
+
+#sapp_install_dir=`rpm -qa --queryformat '%{name}-%{version} %{instprefixes}\n' sapp`
+sapp_install_dir=`rpm -qa --queryformat '%{instprefixes}\n' sapp`
+
+echo "[Unit]" > /opt/sapp/env/sapp.service.tmp
+echo "Description=sapp service" >> /opt/sapp/env/sapp.service.tmp
+echo "Wants=network-online.target" >> /opt/sapp/env/sapp.service.tmp
+echo "Requires=sapp-env.service" >> /opt/sapp/env/sapp.service.tmp
+echo "After=sapp-env.service" >> /opt/sapp/env/sapp.service.tmp
+echo "[Service]" >> /opt/sapp/env/sapp.service.tmp
+echo "WorkingDirectory=$sapp_install_dir" >> /opt/sapp/env/sapp.service.tmp
+echo "ExecStart=$sapp_install_dir/sapp" >> /opt/sapp/env/sapp.service.tmp
+echo "Restart=always" >> /opt/sapp/env/sapp.service.tmp
+echo "RestartSec=5s" >> /opt/sapp/env/sapp.service.tmp
+echo "[Install]" >> /opt/sapp/env/sapp.service.tmp
+echo "WantedBy=multi-user.target" >> /opt/sapp/env/sapp.service.tmp
+
+cp -f /opt/sapp/env/sapp.service.tmp /usr/lib/systemd/system/sapp.service
+
+#systemctl enable sapp
+systemctl daemon-reload
+
+
+
+