Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B4F26186E2 for ; Sat, 5 Dec 2015 17:50:08 +0000 (UTC) Received: (qmail 54474 invoked by uid 500); 5 Dec 2015 17:50:08 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 54381 invoked by uid 500); 5 Dec 2015 17:50:08 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 54103 invoked by uid 99); 5 Dec 2015 17:50:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Dec 2015 17:50:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EADADE095E; Sat, 5 Dec 2015 17:50:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Sat, 05 Dec 2015 17:50:10 -0000 Message-Id: <2f2118dc69db492bb26d3a7bb1229ad1@git.apache.org> In-Reply-To: <57b717d6b383450db2ed716a48237dc2@git.apache.org> References: <57b717d6b383450db2ed716a48237dc2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: updated refs/heads/master to 74e33dc Merge pull request #840 from bvbharatk/CLOUDSTACK-8852 CLOUDSTACK-8852 Database shows that management server is UP when it iDatabase shows that management server is UP when it is actually stopped. This was happening as the stop method in clusterMnanagerImpl was not getting callled. Added shutdown hooks to all spring sub contexts, this enables spring to call the stop mehtods of the beans when management server is shutting down. Conflicts: framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/CloudStackContextLoaderListener.java * pr/840: CLOUDSTACK-8852 Database shows that management server is UP when it is actually stopped from the CCP GUI Signed-off-by: Remi Bergsma Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/74e33dc5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/74e33dc5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/74e33dc5 Branch: refs/heads/master Commit: 74e33dc5ae95e2546a1742c5029d13eb86704fe9 Parents: 1056f3c 4849368 Author: Remi Bergsma Authored: Sat Dec 5 18:47:52 2015 +0100 Committer: Remi Bergsma Committed: Sat Dec 5 18:47:53 2015 +0100 ---------------------------------------------------------------------- .../centos/SYSCONFDIR/rc.d/init.d/cloud-management.in | 2 +- .../spring/lifecycle/CloudStackExtendedLifeCycle.java | 1 + .../spring/module/factory/CloudStackSpringContext.java | 11 ++++++++--- .../spring/module/model/ModuleDefinitionSet.java | 4 ++++ .../module/model/impl/DefaultModuleDefinitionSet.java | 5 +++++ .../module/web/CloudStackContextLoaderListener.java | 1 + .../network/contrail/management/ContrailManagerImpl.java | 4 +++- 7 files changed, 23 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74e33dc5/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java ----------------------------------------------------------------------