[Personalrobots-commit] SF.net SVN: personalrobots:[23000] pkg/trunk/sandbox/web

[<wgh...@us...>]

Revision: 23000
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23000&view=rev
Author:   wghassan
Date:     2009-08-26 18:59:29 +0000 (Wed, 26 Aug 2009)

Log Message:
-----------
turn roslib caching to 1 hour and catch broken pipe exceptions

Modified Paths:
--------------
    pkg/trunk/sandbox/web/rosweb2/src/rosweb.py
    pkg/trunk/sandbox/web/webui/src/webui/startcgi.py
    pkg/trunk/sandbox/web/webui/src/webui/startmod.py

Modified: pkg/trunk/sandbox/web/rosweb2/src/rosweb.py
===================================================================
--- pkg/trunk/sandbox/web/rosweb2/src/rosweb.py	2009-08-26 18:59:18 UTC (rev 22999)
+++ pkg/trunk/sandbox/web/rosweb2/src/rosweb.py	2009-08-26 18:59:29 UTC (rev 23000)
@@ -356,17 +356,24 @@
         return 1
 
     def _send_responsepage(self, retcode=200, buf = "{}", callback = None):
-      self.send_response(retcode)
-      if callback:
-        buf = callback + "(" + buf + ");"
-        self.send_header('Content-Type', 'text/javascript')
-      else:
-        self.send_header('Content-Type', 'application/json')
-      self.send_header('Content-Length', str(len(buf)))
-      self.end_headers()
-      
-      self.wfile.write(buf)
+      try:
+        self.send_response(retcode)
+        if callback:
+          buf = callback + "(" + buf + ");"
+          self.send_header('Content-Type', 'text/javascript')
+        else:
+          self.send_header('Content-Type', 'application/json')
+        self.send_header('Content-Length', str(len(buf)))
+        self.end_headers()
 
+        self.wfile.write(buf)
+      except socket.error, (ecode, reason):
+        if ecode == 32:
+          print ecode, reason
+        else:
+          raise
+                        
+
     def send_success(self, buf = "{}", callback=None):
       self._send_responsepage(200, buf, callback)
 

Modified: pkg/trunk/sandbox/web/webui/src/webui/startcgi.py
===================================================================
--- pkg/trunk/sandbox/web/webui/src/webui/startcgi.py	2009-08-26 18:59:18 UTC (rev 22999)
+++ pkg/trunk/sandbox/web/webui/src/webui/startcgi.py	2009-08-26 18:59:29 UTC (rev 23000)
@@ -19,6 +19,7 @@
 
   os.environ['HOME'] = '/tmp'
 
+os.environ['ROS_CACHE_TIMEOUT'] = '3600'
 PKG = 'webui' # this package name
 import roslib; roslib.load_manifest(PKG) 
 ros_root = os.environ['ROS_ROOT']

Modified: pkg/trunk/sandbox/web/webui/src/webui/startmod.py
===================================================================
--- pkg/trunk/sandbox/web/webui/src/webui/startmod.py	2009-08-26 18:59:18 UTC (rev 22999)
+++ pkg/trunk/sandbox/web/webui/src/webui/startmod.py	2009-08-26 18:59:29 UTC (rev 23000)
@@ -9,8 +9,10 @@
 os.environ['ROS_PACKAGE_PATH'] =  '/u/hassan/pr2/ros-pkg'
 os.environ['ROS_MASTER_URI'] =  'http://localhost:11311/'
 os.environ['PATH'] = os.path.join(rosroot, "bin") + ":" + os.environ.get('PATH', "")
+os.environ['ROS_BOOST_PATH'] = '/opt/ros/'
 os.environ['HOME'] = '/tmp'
 
+os.environ['ROS_CACHE_TIMEOUT'] = '3600'
 PKG = 'webui' # this package name
 import roslib; roslib.load_manifest(PKG) 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.