← 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-02-26 02:08:28 UTC
  • Revision ID: grantw@unimelb.edu.au-20090226020828-0qrhe3llq9r5olmr
ivle-showenrolment: Swap year and semester, and show the role.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/console/service.py
31
31
 
32
32
import ivle.console
33
33
import ivle.chat
 
34
import ivle.conf
34
35
from ivle.webapp.base.rest import JSONRESTView, named_operation
35
36
from ivle.webapp.errors import BadRequest
36
37
 
50
51
        uid = req.user.unixid
51
52
 
52
53
        # Start the server
53
 
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
54
 
                                 req.user.login)
 
54
        jail_path = os.path.join(ivle.conf.jail_base, req.user.login)
55
55
        cons = ivle.console.Console(uid, jail_path, working_dir)
56
56
 
57
57
        # Assemble the key and return it. Yes, it is double-encoded.
76
76
        except KeyError:
77
77
            raise BadRequest("Invalid console key.")
78
78
 
79
 
        jail_path = os.path.join(req.config['paths']['jails']['mounts'],
80
 
                                 req.user.login)
 
79
        jail_path = os.path.join(ivle.conf.jail_base, req.user.login)
81
80
        working_dir = os.path.join("/home", req.user.login)   # Within jail
82
81
        uid = req.user.unixid
83
82
 
84
 
        # XXX: JSONRESTView should do this for us.
85
 
        text = text.decode('utf-8')
86
 
 
87
83
        msg = {'cmd':kind, 'text':text}
88
84
        try:
89
85
            json_response = ivle.chat.chat(host, port, msg, magic,decode=False)