← 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: 2009-05-27 06:36:58 UTC
  • Revision ID: grantw@unimelb.edu.au-20090527063658-46rcvgh23qlxno87
No more ivle.conf in ivle.auth.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/console/service.py
52
52
        # Start the server
53
53
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
54
54
                                 req.user.login)
55
 
        cons = ivle.console.Console(uid, jail_path, working_dir)
 
55
        cons = ivle.console.Console(req.config, uid, jail_path, working_dir)
56
56
 
57
57
        # Assemble the key and return it. Yes, it is double-encoded.
58
58
        return {'key': cjson.encode({"host": cons.host,
96
96
                response = {"terminate":
97
97
                    "Communication to console process lost"}
98
98
            if "terminate" in response:
99
 
                response = restart_console(uid, jail_path, working_dir,
100
 
                    response["terminate"])
 
99
                response = restart_console(req.config, uid, jail_path,
 
100
                    working_dir, response["terminate"])
101
101
        except socket.error, (enumber, estring):
102
102
            if enumber == errno.ECONNREFUSED:
103
103
                # Timeout: Restart the session
104
 
                response = restart_console(uid, jail_path, working_dir,
 
104
                response = restart_console(req.config, uid, jail_path,
 
105
                    working_dir,
105
106
                    "The IVLE console has timed out due to inactivity")
106
107
            elif enumber == errno.ECONNRESET:
107
108
                # Communication issue: Restart the session
108
 
                response = restart_console(uid, jail_path, working_dir,
 
109
                response = restart_console(req.config, uid, jail_path,
 
110
                    working_dir,
109
111
                    "Connection with the console has been reset")
110
112
            else:
111
113
                # Some other error - probably serious
113
115
        return response
114
116
 
115
117
 
116
 
def restart_console(uid, jail_path, working_dir, reason):
 
118
def restart_console(config, uid, jail_path, working_dir, reason):
117
119
    """Tells the client that it must be issued a new console since the old 
118
120
    console is no longer availible. The client must accept the new key.
119
121
    Returns the JSON response to be given to the client.
120
122
    """
121
123
    # Start a new console server console
122
 
    cons = ivle.console.Console(uid, jail_path, working_dir)
 
124
    cons = ivle.console.Console(config, uid, jail_path, working_dir)
123
125
 
124
126
    # Make a JSON object to tell the browser to restart its console client
125
127
    new_key = cjson.encode(