summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Dapena Paz <jdapena@igalia.com>2022-03-30 10:04:42 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-05-03 20:11:21 +0000
commitfe41b05648235b07a65962bc425e2fb258bd38bc (patch)
tree4dbc32b38b4ffb9b349538d203ba48ccfa3765a4
parent85bab6fcc3a02167a164d57816a982eeb5d6eea2 (diff)
wam: improve shutdown procedure
It was observed that restarting agl-session would crash and/or hang WAM. So this change binds WAM to agl-compositor in systemd service file. This means stopping compositor will stop WAM. It also fixes another problem on restart, as the WAM launcher processes from previous execution would still be alive. So it forces killing all the WAM processes for the user on shutdown. Bug-AGL: SPEC-4293 Change-Id: I5131cdd56c292c66d0f2d5ea88cf772ef9b4bd56 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
-rw-r--r--recipes-wam/wam/files/WebAppMgr.service2
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-wam/wam/files/WebAppMgr.service b/recipes-wam/wam/files/WebAppMgr.service
index a2e58abef..082a488cc 100644
--- a/recipes-wam/wam/files/WebAppMgr.service
+++ b/recipes-wam/wam/files/WebAppMgr.service
@@ -15,6 +15,7 @@ Description="WebAppMgr is responsible for running web apps and manage their life
After=agl-compositor.service
Requires=agl-compositor.service
Before=agl-session.target
+BindTo=agl-compositor.service
[Service]
Type=simple
@@ -22,6 +23,7 @@ UMask=0077
OOMScoreAdjust=-1000
EnvironmentFile=-/etc/default/WebAppMgr.env
ExecStart=/usr/bin/WebAppMgr --use-gl=egl --enable-features=UseOzonePlatform --ozone-platform=wayland --no-sandbox --use-viz-fmp-with-timeout=0 --in-process-gpu --remote-debugging-port=9998 --user-data-dir="/home/%u/wamdata" --webos-wam --agl-shell-appid=homescreen --disable-gpu-vsync
+ExecStop=pkill -U %U WebAppMgr
Restart=on-failure
RestartSec=50