try harder to shutdown properly

2 files changed, 6 insertions, 2 deletions

diff --git a/bin/datastore b/bin/datastore
index 52d5bd5..679df98 100755
--- a/bin/datastore
+++ b/bin/datastore
@@ -46,7 +46,9 @@ class DataStoreApplication(Application):
         signal.signal(signal.SIGHUP, handle_shutdown)
         signal.signal(signal.SIGTERM, handle_shutdown)
 
-        self.eventloop.run()
+        try:
+            self.eventloop.run()
+        except: self.ds.stop()
 
 dsa = DataStoreApplication("datastore")
 dsa.plugins.append('ore.main.profile_support.ProfileSupport')
diff --git a/bin/datastore-service b/bin/datastore-service
index 93f9167..981e06d 100755
--- a/bin/datastore-service
+++ b/bin/datastore-service
@@ -48,7 +48,9 @@ signal.signal(signal.SIGTERM, handle_shutdown)
 
 def main():
     try: mainloop.run()
-    except KeyboardInterrupt: logger.info("DataStore shutdown by user")
+    except KeyboardInterrupt:
+        ds.stop()
+        logger.info("DataStore shutdown by user")
     except:
         ds.stop()
         logger.debug("Datastore shutdown with error",