From: Chunling Ye Date: Wed, 17 Apr 2024 10:07:48 +0000 (+0800) Subject: [WRTjs][Service] Call finalizeService after service app's worker deleted X-Git-Tag: submit/tizen/20240513.160027^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=181f0f640e88c61d38959c6ea98228675185b8d1;p=platform%2Fframework%2Fweb%2Fwrtjs.git [WRTjs][Service] Call finalizeService after service app's worker deleted Have relationship with patch: https://review.tizen.org/gerrit/309848 Change-Id: Ic1afb2cabc4ac60c76212b7c90c1d7084fef143b Signed-off-by: Chunling Ye --- diff --git a/wrt_app/service/service_manager.ts b/wrt_app/service/service_manager.ts index 37fea323..4d8b55ba 100644 --- a/wrt_app/service/service_manager.ts +++ b/wrt_app/service/service_manager.ts @@ -96,6 +96,9 @@ function createWorker(id: string, startService: string, filename: string) { wrt.tv?.serviceUmount(id); delete workerStatus[id]; delete workers[id]; + console.debug(`${id} workers deleted`); + if (global['serviceType'] === 'GLOBAL') + wrt.finalizeService(id); let runningServices = Object.keys(workers); console.debug(`${id} terminated, remain services(${runningServices})`); checkDyingWorker(); @@ -105,6 +108,8 @@ function createWorker(id: string, startService: string, filename: string) { function terminateWorker(id: string, delay: number) { if (!workers[id]) { console.debug(`This worker is already terminated. ${id}`); + if (global['serviceType'] === 'GLOBAL') + wrt.finalizeService(id); return; } console.debug(`${id} will shutdown after ${delay}ms`); diff --git a/wrt_app/service/service_runner.ts b/wrt_app/service/service_runner.ts index 35db1a60..22803f5a 100644 --- a/wrt_app/service/service_runner.ts +++ b/wrt_app/service/service_runner.ts @@ -137,9 +137,6 @@ export function stop(id: string) { } } catch (e) { console.debug(`exception on stop: ${e}`); - } finally { - if (isGlobalService()) - wrt.finalizeService(id); } }