updated hostname #633

packages/slycat/web/server/engine.py

@@ -144,7 +144,7 @@ def abspath(path):
 
   #TODO: scrub sid
   dispatcher.connect("post-checksid", "/remotes/checksid", slycat.web.server.handlers.post_checksid, conditions={ "method": ["POST"] })
-  dispatcher.connect("post-remote-launch", "/remotes/launch", slycat.web.server.handlers.post_remote_launch, conditions={ "method": ["POST"] })
+  dispatcher.connect("post-remote-launch", "/remotes/:hostname/launch", slycat.web.server.handlers.post_remote_launch, conditions={ "method": ["POST"] })
   dispatcher.connect("post-submit-batch", "/remotes/:hostname/submit-batch", slycat.web.server.handlers.post_submit_batch, conditions={ "method": ["POST"] })
   dispatcher.connect("get-checkjob", "/remotes/checkjob/:hostname/:jid", slycat.web.server.handlers.get_checkjob, conditions={ "method": ["GET"] })
   dispatcher.connect("delete-job", "/remotes/delete-job/:hostname/:jid", slycat.web.server.handlers.delete_job, conditions={ "method": ["DELETE"] })

packages/slycat/web/server/handlers.py

@@ -2014,8 +2014,8 @@ def post_checksid():
 
 @cherrypy.tools.json_in(on=True)
 @cherrypy.tools.json_out(on=True)
-def post_remote_launch():
-    sid = cherrypy.request.json["sid"]
+def post_remote_launch(hostname):
+    sid = get_sid(hostname)
     command = cherrypy.request.json["command"]
     with slycat.web.server.remote.get_session(sid) as session:
         return session.launch(command)

web-server/js/slycat-web-client.js

@@ -844,11 +844,10 @@ define("slycat-web-client", ["slycat-server-root", "jquery", "URI"], function(se
     $.ajax({
       contentType: 'application/json',
       data: JSON.stringify({
-        sid: params.sid,
         command: params.command
       }),
       type: 'POST',
-      url: server_root + 'remotes/launch',
+      url: server_root + 'remotes/'+params.hostname+'/launch',
       success: function(result) {
         if (params.success)
           params.success(result);