From commits-return-67264-archive-asf-public=cust-asf.ponee.io@sling.apache.org Tue May 8 16:06:26 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 475BC18063B for ; Tue, 8 May 2018 16:06:26 +0200 (CEST) Received: (qmail 94391 invoked by uid 500); 8 May 2018 14:06:25 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 94382 invoked by uid 99); 8 May 2018 14:06:25 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 May 2018 14:06:25 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id B025781652; Tue, 8 May 2018 14:06:24 +0000 (UTC) Date: Tue, 08 May 2018 14:06:24 +0000 To: "commits@sling.apache.org" Subject: [sling-org-apache-sling-feature-launcher] branch master updated: Wait for 10 seconds for framework stop on kill. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152578838468.15673.456846211617419339@gitbox.apache.org> From: pauls@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: sling-org-apache-sling-feature-launcher X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4648f5d5787d1f92fe2850b99b37f790a9b87019 X-Git-Newrev: 9ba0848f5e9b499a3b0ad78dbddc2e8abec0f598 X-Git-Rev: 9ba0848f5e9b499a3b0ad78dbddc2e8abec0f598 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. pauls pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git The following commit(s) were added to refs/heads/master by this push: new 9ba0848 Wait for 10 seconds for framework stop on kill. 9ba0848 is described below commit 9ba0848f5e9b499a3b0ad78dbddc2e8abec0f598 Author: Karl Pauls AuthorDate: Tue May 8 16:06:14 2018 +0200 Wait for 10 seconds for framework stop on kill. --- .../launcher/impl/launchers/FrameworkLauncher.java | 1 + .../feature/launcher/impl/launchers/FrameworkRunner.java | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java b/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java index ded2239..12a5c66 100644 --- a/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java +++ b/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java @@ -98,5 +98,6 @@ public class FrameworkLauncher implements Launcher { Main.LOG().debug("Startup took: " + (System.currentTimeMillis() - time)); // nothing else to do, constructor starts everything + // TODO: wait for stop and restart framework when necessary } } diff --git a/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java b/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java index 5d95cef..f17b6c3 100644 --- a/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java +++ b/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java @@ -16,7 +16,9 @@ */ package org.apache.sling.feature.launcher.impl.launchers; +import org.apache.sling.feature.launcher.impl.Main; import org.osgi.framework.BundleException; +import org.osgi.framework.FrameworkEvent; import org.osgi.framework.launch.Framework; import org.osgi.framework.launch.FrameworkFactory; @@ -56,8 +58,18 @@ public class FrameworkRunner extends AbstractRunner { public void run() { try { framework.stop(); - } catch (final BundleException e) { - // ignore + FrameworkEvent waitForStop = framework.waitForStop(10000); + if (waitForStop.getType() != FrameworkEvent.STOPPED) + { + Main.LOG().warn("Framework stopped with: " + waitForStop.getType(), waitForStop.getThrowable()); + } + else + { + Main.LOG().info("Framework stopped"); + } + } catch (BundleException | InterruptedException e) + { + Main.LOG().warn("Exception stopping the framework in shutdown hook", e); } } }); -- To stop receiving notification emails like this one, please contact pauls@apache.org.