[FIX] server.stop: avoid traceback during shutdown if HTTP service never started...

bzr revid: odo@openerp.com-20140304093240-0yfoe3s0xz0u0xv9

diff --git a/openerp/service/server.py b/openerp/service/server.py
index b3d16bc..3d02215 100644 (file)
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -285,8 +285,9 @@ class ThreadedServer(CommonServer):
         _logger.info("Initiating shutdown")
         _logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
 
-        self.httpd.shutdown()
-        self.close_socket(self.httpd.socket)
+        if self.httpd:
+            self.httpd.shutdown()
+            self.close_socket(self.httpd.socket)
 
         # Manually join() all threads before calling sys.exit() to allow a second signal
         # to trigger _force_quit() in case some non-daemon threads won't exit cleanly.