Changeset 2449

Timestamp:

Aug 21, 2009, 12:13:42 PM (15 years ago)

Author:

ecprice

Message:

Fix race condition in ajaxterm

File:

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

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

@@ -1 +1 @@
 #!/usr/bin/python
 """Main CGI script for web interface"""
+
+from __future__ import with_statement
 
 import base64
@@ -11 +13 @@
 import simplejson
 import sys
+import threading
 import time
 import urllib
@@ -16 +19 @@
 import cherrypy
 from StringIO import StringIO
+
 def revertStandardError():
     """Move stderr to stdout, and return the contents of the old stderr."""
@@ -282 +286 @@
         atmulti = ajaxterm.Multiplex()
         atsessions = {}
+        atsessions_lock = threading.Lock()
 
         @cherrypy.expose
@@ -301 +306 @@
         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:
-                term = self.atsessions[machine_id]
-            else:
-                print >>sys.stderr, "spawning new session for terminal to ",machine_id
-                term = self.atsessions[machine_id] = self.atmulti.create(
-                    ["ssh", "-e","none", "-l", machine.name, config.console.hostname]
-                    )
-            if k:
-                self.atmulti.proc_write(term,k)
-            time.sleep(0.002)
-            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>'
+            with self.atsessions_lock:
+                if machine_id in self.atsessions:
+                    term = self.atsessions[machine_id]
+                else:
+                    print >>sys.stderr, "spawning new session for terminal to ",machine_id
+                    term = self.atsessions[machine_id] = self.atmulti.create(
+                        ["ssh", "-e","none", "-l", machine.name, config.console.hostname]
+                        )
+                if k:
+                    self.atmulti.proc_write(term,k)
+                time.sleep(0.002)
+                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>'
 
     machine = MachineView()