From f8d79f06e3dea3cc338eba9b6780390d09ebb8aa Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Tue, 25 Nov 2014 20:43:23 +0100
Subject: [PATCH] More graceful CallbackServer shutdown

---
 bootstrapvz/base/remote/callback.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bootstrapvz/base/remote/callback.py b/bootstrapvz/base/remote/callback.py
index b494e8f..a4fc6d8 100644
--- a/bootstrapvz/base/remote/callback.py
+++ b/bootstrapvz/base/remote/callback.py
@@ -20,5 +20,7 @@ class CallbackServer(object):
 		self.thread.start()
 
 	def stop(self):
-		self.daemon.shutdown()
-		self.thread.join()
+		if hasattr(self, 'daemon'):
+			self.daemon.shutdown()
+		if hasattr(self, 'thread'):
+			self.thread.join()