Changeset 2435 for package_branches/invirt-web/cherrypy/code/main.py

Timestamp:

Aug 11, 2009, 1:15:07 AM (15 years ago)

Author:

quentin

Message:

Allow reconnecting to the same terminal session

File:

• package_branches/invirt-web/cherrypy/code/main.py (modified) (2 diffs)

package_branches/invirt-web/cherrypy/code/main.py

@@ -298 +298 @@
 
         @cherrypy.expose
-        def at(self, machine_id, k=None, c=0):
+        def at(self, machine_id, k=None, c=0, force=0):
             machine = validation.Validate(cherrypy.request.login, cherrypy.request.state, machine_id=machine_id).machine
             if machine_id in self.atsessions:
@@ -310 +310 @@
                 self.atmulti.proc_write(term,k)
             time.sleep(0.002)
-            dump=self.atmulti.dump(term,c)
+            dump=self.atmulti.dump(term,c,int(force))
             cherrypy.response.headers['Content-Type']='text/xml'
             if isinstance(dump,str):
                 return dump
             else:
+                print "Removing session for", machine_id
                 del self.atsessions[machine_id]
                 return '<?xml version="1.0"?><idem></idem>'