Ticket #2359: sage-2359.patch

sage/server/notebook/run_notebook.py

@@ -166 +166 @@
 # WARNING -- Do not edit this file!   It is autogenerated each time
 # the notebook(...) command is executed.
 ####################################################################
+from twisted.internet import reactor
 
 # Now set things up and start the notebook
 import sage.server.notebook.notebook
@@ -181 +182 @@
 worksheet.init_sage_prestart(twist.notebook.get_server(), twist.notebook.get_ulimit())
 
 import signal, sys, random
+def save_notebook():
+    print "Saving notebook..."
+    twist.notebook.save()
+    reactor.stop()
+    print "Notebook cleanly saved."
+    
 def my_sigint(x, n):
-    twist.notebook.save()
+    save_notebook()
     signal.signal(signal.SIGINT, signal.SIG_DFL)
-    print "(Notebook cleanly saved. Press control-C again to exit.)"
+    
     
 signal.signal(signal.SIGINT, my_sigint)
 
@@ -193 +200 @@
     import gnutls.connection
     gnutls.connection.CERT_REQUEST = 0
 except OSError:
-    print "Note: GNUTLS not available." 
+    print "Note: GNUTLS not available."
+
 
 ## Authentication framework (ported from Knooboo)
 from twisted.web2 import log, server, channel
@@ -223 +231 @@
 s = strports.service('%s', factory)
 %s
 s.setServiceParent(application)
+
+reactor.addSystemEventTrigger('before', 'shutdown', save_notebook)
+
 """%(notebook_opts, sagetex_path, not require_login,
      os.path.abspath(directory), strport, open_page))
 
@@ -235 +246 @@
         if secure and not quiet:
             print "There is an admin account.  If you do not remember the password,"
             print "quit the notebook and type notebook(reset=True)."
-        cmd = 'sage -twistd --pidfile="%s"/twistd.pd -ny "%s"/twistedconf.tac'%(directory, directory)
+        cmd = 'sage -twistd --pidfile="%s"/twistd.pid -ny "%s"/twistedconf.tac'%(directory, directory)
         if fork:
             return pexpect.spawn(cmd)
         else: