update monitor service config

CMakeLists.txt

@@ -167,6 +167,7 @@ install(TARGETS scadaplugin
 # install conf
 install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/conf/monitor.service
+    ${CMAKE_CURRENT_SOURCE_DIR}/conf/30-monitor.conf
     DESTINATION ${PROJECT_NAME}
     PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
                 GROUP_EXECUTE GROUP_READ

Makefile

@@ -21,7 +21,7 @@ install:
 	cmake --install build
 
 deploy:
-	scp -r  $(PREFIX)/monitor forlinx@${ADDR}:/home/forlinx
+	scp -r  $(PREFIX)/monitor forlinx@${ADDR}:/userdata/workspace
 
 # 打包：将指定目录下的所有内容打包到压缩包根目录
 package:

README.md

@@ -21,3 +21,9 @@ systemctl daemon-reload
 systemctl enable --now monitor
 systemctl status monitor
 ```
+### disable log to syslog
+- `/etc/rsyslog.d/30-monitor.conf`
+- `systemctl restart rsyslog`
+```
+if ($programname == 'monitor') or ($systemdunit == 'monitor.service') then stop
+```

conf/30-monitor.conf

@@ -0,0 +1 @@
+if ($programname == 'monitor') or ($systemdunit == 'monitor.service') then stop

conf/monitor.service

@@ -4,12 +4,14 @@ After=graphical.target
 
 [Service]
 Type=simple
-ExecStart=/home/forlinx/monitor/run.sh
+WorkingDirectory=/userdata/workspace/monitor
+ExecStart=bash run.sh
+SyslogIdentifier=monitor
 Restart=always
 RestartSec=3
 User=forlinx
 Environment=DISPLAY=:0
-Environment=XAUTHORITY=/home/forlinx/.Xauthority
+# Environment=XAUTHORITY=/home/forlinx/.Xauthority
 
 # 如果需要日志
 StandardOutput=journal

scripts/install.sh

@@ -2,4 +2,12 @@
 
 cp monitor.service /etc/systemd/system/monitor.service
 systemctl daemon-reload
-systemctl enable --now monitor
+systemctl enable monitor
+
+
+# disable log to syslog
+cp 30-monitor.conf /etc/rsyslog.d/30-monitor.conf
+systemctl restart rsyslog
+
+# restart
+systemctl restart monitor

scripts/run.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-cd /home/forlinx/monitor
-
 # for remote ssh
 export XDG_RUNTIME_DIR=/run/user/1000
 export QT_QPA_PLATFORM=wayland