Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Allow to specify port with --devtools option (fixes #3597)

Browse source 
Note that using `servo --devtools http://example.org` doesn't work. In
that case either the port must be specified or the option moved to the
end. This is done by getopts and is the same for other such options,
e.g. `--profile`.
This commit is contained in:
Robin Stocker 2014-10-08 23:29:15 +11:00
parent 94731270df
commit 8a5c6a0d3b
4 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/devtools/lib.rs
View file

@ -58,20 +58,19 @@ mod actors {
}
mod protocol;
/// Spin up a devtools server that listens for connections. Defaults to port 6000.
/// TODO: allow specifying a port
pub fn start_server() -> Sender<DevtoolsControlMsg> {
let (chan, port) = comm::channel();
/// Spin up a devtools server that listens for connections on the specified port.
pub fn start_server(port: u16) -> Sender<DevtoolsControlMsg> {
let (sender, receiver) = comm::channel();
TaskBuilder::new().named("devtools").spawn(proc() {
run_server(port)
run_server(receiver, port)
});
chan
sender
}
static POLL_TIMEOUT: u64 = 300;
fn run_server(port: Receiver<DevtoolsControlMsg>) {
let listener = TcpListener::bind("127.0.0.1", 6000);
fn run_server(receiver: Receiver<DevtoolsControlMsg>, port: u16) {
let listener = TcpListener::bind("127.0.0.1", port);
// bind the listener to the specified address
let mut acceptor = listener.listen().unwrap();
@ -185,7 +184,7 @@ fn run_server(port: Receiver<DevtoolsControlMsg>) {
loop {
match acceptor.accept() {
Err(ref e) if e.kind == TimedOut => {
match port.try_recv() {
match receiver.try_recv() {
Ok(ServerExitMsg) | Err(Disconnected) => break,
Ok(NewGlobal(id, sender)) => handle_new_global(actors.clone(), id, sender),
Err(Empty) => acceptor.set_timeout(Some(POLL_TIMEOUT)),