From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmd7C-00056D-Jy for qemu-devel@nongnu.org; Wed, 21 Sep 2016 04:42:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmd79-0003bW-BB for qemu-devel@nongnu.org; Wed, 21 Sep 2016 04:42:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33436) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmd79-0003bS-54 for qemu-devel@nongnu.org; Wed, 21 Sep 2016 04:42:47 -0400 Date: Wed, 21 Sep 2016 09:42:43 +0100 From: "Daniel P. Berrange" Message-ID: <20160921084243.GI15535@redhat.com> Reply-To: "Daniel P. Berrange" References: <1474429768-25027-1-git-send-email-famz@redhat.com> <1474429768-25027-9-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1474429768-25027-9-git-send-email-famz@redhat.com> Subject: Re: [Qemu-devel] [PATCH 8/9] docker: Terminate instances at SIGTERM and SIGHUP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: qemu-devel@nongnu.org, Alex =?utf-8?Q?Benn=C3=A9e?= On Wed, Sep 21, 2016 at 11:49:27AM +0800, Fam Zheng wrote: > Signed-off-by: Fam Zheng > --- > tests/docker/docker.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tests/docker/docker.py b/tests/docker/docker.py > index b85c165..552608e 100755 > --- a/tests/docker/docker.py > +++ b/tests/docker/docker.py > @@ -21,6 +21,7 @@ import uuid > import argparse > import tempfile > import re > +import signal > from tarfile import TarFile, TarInfo > from StringIO import StringIO > from shutil import copy, rmtree > @@ -98,6 +99,8 @@ class Docker(object): > self._command = _guess_docker_command() > self._instances = [] > atexit.register(self._kill_instances) > + signal.signal(signal.SIGTERM, self._kill_instances) > + signal.signal(signal.SIGHUP, self._kill_instances) > > def _do(self, cmd, quiet=True, infile=None, **kwargs): > if quiet: > @@ -130,7 +133,7 @@ class Docker(object): > self._do_kill_instances(False, False) > return 0 > > - def _kill_instances(self): > + def _kill_instances(self, *args, **kwargs): > return self._do_kill_instances(True) > > def _output(self, cmd, **kwargs): Reviewed-by: Daniel P. Berrange Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|