[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at v0.0.3-339-gd5e880b

[Scott Seago]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  d5e880b132857d30501c750b90511bfeab01224d (commit)
      from  014f5294e86ebd95bbda9ff463664f8105b874f5 (commit)

- Log -----------------------------------------------------------------
commit d5e880b132857d30501c750b90511bfeab01224d
Author: Scott Seago <sseago at redhat.com>
Date:   Mon Oct 22 15:09:59 2007 -0400

    KeyboardInterrupt mustbe  re-raised in check_status, since that exception is caught when the server is stopped or restarted.
-----------------------------------------------------------------------

Diffstat:
 nodes/nodes/server.py |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/nodes/nodes/server.py b/nodes/nodes/server.py
index f658f58..304cd1f 100755
--- a/nodes/nodes/server.py
+++ b/nodes/nodes/server.py
@@ -197,6 +197,9 @@ def serve_status():
          details = None
          try:
              (retcode, details) = amqp_conn.server.deployment_get_by_mac_address("UNSET",{ "mac_address" : name})
+         #re-raise these, as that's how the server shuts down
+         except KeyboardInterrupt:
+             raise
          except:
              # can't figure out to auto start this one...
              (t, v, tb) = sys.exc_info()
@@ -236,6 +239,9 @@ def serve_status():
              try:
                  # reconnect each time to avoid errors
                  virt_conn = virt_utils.VirtFactoryLibvirtConnection()
+             #re-raise these, as that's how the server shuts down
+             except KeyboardInterrupt:
+                 raise
              except:
                  logger.error("libvirt connection failed")
                  continue         
@@ -273,6 +279,9 @@ def serve_status():
              # rc = poller.poll(SLEEP_INTERVAL, select.POLLIN|select.POLLPRI)
               
 
+         #re-raise these, as that's how the server shuts down
+         except KeyboardInterrupt:
+             raise
          except:
              (t, v, tb) = sys.exc_info()
              logger.info("Exception occured: %s" % t )
@@ -305,6 +314,7 @@ def main(argv):
         try:
             serve_status()
         except KeyboardInterrupt:
+            print "caught interrupt"
             os.kill(pid, signal.SIGINT)
             os.waitpid(pid,0)
         

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  014f5294e86ebd95bbda9ff463664f8105b874f5 \
  d5e880b132857d30501c750b90511bfeab01224d