Return-Path: X-Original-To: apmail-community-commits-archive@minotaur.apache.org Delivered-To: apmail-community-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 75E2C18927 for ; Sat, 6 Feb 2016 14:54:16 +0000 (UTC) Received: (qmail 96923 invoked by uid 500); 6 Feb 2016 14:54:16 -0000 Delivered-To: apmail-community-commits-archive@community.apache.org Received: (qmail 96896 invoked by uid 500); 6 Feb 2016 14:54:16 -0000 Mailing-List: contact commits-help@community.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@community.apache.org Delivered-To: mailing list commits@community.apache.org Received: (qmail 96887 invoked by uid 99); 6 Feb 2016 14:54:16 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Feb 2016 14:54:16 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 03A321A04EC for ; Sat, 6 Feb 2016 14:54:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.571 X-Spam-Level: X-Spam-Status: No, score=0.571 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.429] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id Ll5WGW9Y2OLs for ; Sat, 6 Feb 2016 14:54:15 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id 6D8F820CDE for ; Sat, 6 Feb 2016 14:54:15 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id ED215E02E5 for ; Sat, 6 Feb 2016 14:54:14 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id DD1513A01DD for ; Sat, 6 Feb 2016 14:54:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1728843 - /comdev/projects.apache.org/scripts/cronjobs/pubsubber.py Date: Sat, 06 Feb 2016 14:54:14 -0000 To: commits@community.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160206145414.DD1513A01DD@svn01-us-west.apache.org> Author: sebb Date: Sat Feb 6 14:54:14 2016 New Revision: 1728843 URL: http://svn.apache.org/viewvc?rev=1728843&view=rev Log: Try gentle shutdown first; don't print stack trace when interrupt occurs during sleep Modified: comdev/projects.apache.org/scripts/cronjobs/pubsubber.py Modified: comdev/projects.apache.org/scripts/cronjobs/pubsubber.py URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/scripts/cronjobs/pubsubber.py?rev=1728843&r1=1728842&r2=1728843&view=diff ============================================================================== --- comdev/projects.apache.org/scripts/cronjobs/pubsubber.py (original) +++ comdev/projects.apache.org/scripts/cronjobs/pubsubber.py Sat Feb 6 14:54:14 2016 @@ -119,6 +119,9 @@ class daemon: # Try killing the daemon process try: + # Try gentle stop first + os.kill(pid, signal.SIGINT) + time.sleep(0.2) while 1: os.kill(pid, signal.SIGTERM) time.sleep(0.1) @@ -272,7 +275,11 @@ def main(): svn_thread.start() while True: - time.sleep(60) + try: + time.sleep(60) + except KeyboardInterrupt: + print("Detected shutdown interrupt") + pass ############## # Daemonizer #