← 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: Matt Giuca
  • Date: 2010-02-25 09:34:17 UTC
  • Revision ID: matt.giuca@gmail.com-20100225093417-02z6stnx9biqpbol
Exercise display: Shows a warning if the worksheet cutoff has passed for this subject, that it will not count towards your marks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/console/service.py
47
47
    def start(self, req, cwd=''):
48
48
        working_dir = os.path.join("/home", req.user.login, cwd)
49
49
 
 
50
        uid = req.user.unixid
 
51
 
50
52
        # Start the server
51
53
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
52
54
                                 req.user.login)
53
 
        cons = ivle.console.Console(req.config, req.user, jail_path,
54
 
                working_dir)
 
55
        cons = ivle.console.Console(req.config, uid, jail_path, working_dir)
55
56
 
56
57
        # Assemble the key and return it. Yes, it is double-encoded.
57
58
        return {'key': cjson.encode({"host": cons.host,
79
80
                                 req.user.login)
80
81
        # Within Jail
81
82
        working_dir = os.path.join("/home", req.user.login, cwd)
 
83
        uid = req.user.unixid
82
84
 
83
85
        # XXX: JSONRESTView should do this for us.
84
86
        text = text.decode('utf-8')
92
94
            except (cjson.DecodeError, ivle.chat.ProtocolError):
93
95
                # Could not decode the reply from the python-console server
94
96
                response = {"terminate":
95
 
                    "Communication lost"}
 
97
                    "Communication to console process lost"}
96
98
            if "terminate" in response:
97
 
                response = restart_console(req.config, req.user, jail_path,
 
99
                response = restart_console(req.config, uid, jail_path,
98
100
                    working_dir, response["terminate"])
99
101
        except socket.error, (enumber, estring):
100
102
            if enumber == errno.ECONNREFUSED:
101
103
                # Timeout: Restart the session
102
 
                response = restart_console(req.config, req.user, jail_path,
 
104
                response = restart_console(req.config, uid, jail_path,
103
105
                    working_dir,
104
 
                    "Timed out due to inactivity")
 
106
                    "The IVLE console has timed out due to inactivity")
105
107
            elif enumber == errno.ECONNRESET:
106
108
                # Communication issue: Restart the session
107
 
                response = restart_console(req.config, req.user, jail_path,
 
109
                response = restart_console(req.config, uid, jail_path,
108
110
                    working_dir,
109
 
                    "Connection reset")
 
111
                    "Connection with the console has been reset")
110
112
            else:
111
113
                # Some other error - probably serious
112
114
                raise socket.error, (enumber, estring)
113
115
        return response
114
116
 
115
117
 
116
 
def restart_console(config, user, 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(config, user, 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(