disable default cherrypy http listener

diff --git a/code/invirt.fcgi b/code/invirt.fcgi
index 7d6dc9c..ded6b68 100755 (executable)
--- a/code/invirt.fcgi
+++ b/code/invirt.fcgi
@@ -64,6 +64,7 @@ if __name__ == "__main__":
         cherrypy.engine.start()
         cherrypy.engine.block()
     else:
         cherrypy.engine.start()
         cherrypy.engine.block()
     else:

+        cherrypy.server.unsubscribe()

         try:
             # Case that cherrypy < 3.1.0
             cherrypy.engine.start(blocking=False)
         try:
             # Case that cherrypy < 3.1.0
             cherrypy.engine.start(blocking=False)

diff --git a/debian/changelog b/debian/changelog
index 2d877fc..8ac4965 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,13 @@ invirt-web (0.1.31) unstable; urgency=low
 
  -- Peter A. Iannucci <iannucci@mit.edu>  Mon, 20 May 2013 09:00:00 -0400
 
 
  -- Peter A. Iannucci <iannucci@mit.edu>  Mon, 20 May 2013 09:00:00 -0400
 

+invirt-web (0.1.31~dvorak427glasgall1) precise; urgency=low
+
+  * CherryPy starts a http listener by default now. Remove it before
+    starting the engine.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Tue, 30 Apr 2013 19:41:22 -0400
+

 invirt-web (0.1.31~dvorak427) precise; urgency=low
 
   * More updates to fix api changes.
 invirt-web (0.1.31~dvorak427) precise; urgency=low
 
   * More updates to fix api changes.