wam: improve shutdown procedure 22/27322/2
authorJose Dapena Paz <jdapena@igalia.com>
Wed, 30 Mar 2022 08:04:42 +0000 (10:04 +0200)
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tue, 3 May 2022 20:11:21 +0000 (20:11 +0000)
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>
recipes-wam/wam/files/WebAppMgr.service

index a2e58ab..082a488 100644 (file)
@@ -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