← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/console/service.py

  • Committer: William Grant
  • Date: 2010-02-26 03:36:30 UTC
  • Revision ID: grantw@unimelb.edu.au-20100226033630-gqoerwl59i10mbao
Add forgotten template.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/console/service.py
94
94
            except (cjson.DecodeError, ivle.chat.ProtocolError):
95
95
                # Could not decode the reply from the python-console server
96
96
                response = {"terminate":
97
 
                    "Communication to console process lost"}
 
97
                    "Communication lost"}
98
98
            if "terminate" in response:
99
99
                response = restart_console(req.config, uid, jail_path,
100
100
                    working_dir, response["terminate"])
103
103
                # Timeout: Restart the session
104
104
                response = restart_console(req.config, uid, jail_path,
105
105
                    working_dir,
106
 
                    "The IVLE console has timed out due to inactivity")
 
106
                    "Timed out due to inactivity")
107
107
            elif enumber == errno.ECONNRESET:
108
108
                # Communication issue: Restart the session
109
109
                response = restart_console(req.config, uid, jail_path,
110
110
                    working_dir,
111
 
                    "Connection with the console has been reset")
 
111
                    "Connection reset")
112
112
            else:
113
113
                # Some other error - probably serious
114
114
                raise socket.error, (enumber, estring)