Commit 50e356d6cec5b38b946b35da9ddb871b7517ec46 - cg

Add ability to use Unix domain socket Getty Ritter 7 years ago

3 changed file(s) with 45 addition(s) and 7 deletion(s). Collapse all Expand all

-0

Cargo.toml less more

+12

-0

src/errors.rs less more

7	7	Hyper(Error),
8	8	AddrParse(AddrParseError),
9	9	SQLite(::rusqlite::Error),
	10	Env(::std::env::VarError),
	11	IO(::std::io::Error),
10	12	}
11	13
12	14	impl CGError {

18	20	println!("Error parsing address: {}", err),
19	21	&CGError::SQLite(ref err) =>
20	22	println!("Error accessing db: {}", err),
	23	&CGError::Env(ref err) =>
	24	println!("Error reading env var: {}", err),
	25	&CGError::IO(ref err) =>
	26	println!("System I/O error: {}", err),
21	27	}
22	28	}
23	29	}

37	43	impl From<::rusqlite::Error> for CGError {
38	44	fn from(err: ::rusqlite::Error) -> Self {
39	45	CGError::SQLite(err)
	46	}
	47	}
	48
	49	impl From<::std::io::Error> for CGError {
	50	fn from(err: ::std::io::Error) -> Self {
	51	CGError::IO(err)
40	52	}
41	53	}
42	54

+30

-7

src/main.rs less more

6	6	extern crate time;
7	7	extern crate mustache;
8	8	extern crate rustc_serialize;
	9	extern crate tokio_core;
	10	extern crate tokio_io;
	11	extern crate unix_socket;
9	12
10	13	#[macro_use]
11	14	extern crate lazy_static;

54	57
55	58	impl CG {
56	59	fn main() -> Result<(), errors::CGError> {
57		let addr = "127.0.0.1:3000".parse()?;
58		let server = Http::new().bind(&addr, \|\| {
59		let db = rusqlite::Connection::open("cocktails.db").unwrap();
60		Ok(CG { db })
61		})?;
62		println!("serving on {:?}", addr);
63		~~Ok(server.run()?)~~
	60	match std::env::var("CG_UNIX_SOCK") {
	61	Ok(addr) => {
	62	std::fs::remove_file(&addr)?;
	63	let mut socket = unix_socket::UnixListener::bind(addr)?;
	64	let mut core = tokio_core::reactor::Core::new()?;
	65	let http: Http = Http::new();
	66	loop {
	67	let db = rusqlite::Connection::open("cocktails.db")?;
	68	core.run(
	69	http.serve_connection(
	70	tokio_io::io::AllowStdIo::new(socket.accept()?.0),
	71	CG { db },
	72	)
	73	)?;
	74	}
	75	}
	76
	77	Err(_) => {
	78	let addr = "127.0.0.1:3000".parse()?;
	79	let server = Http::new().bind(&addr, \|\| {
	80	let db = rusqlite::Connection::open("cocktails.db").unwrap();
	81	Ok(CG { db })
	82	})?;
	83	println!("serving on {:?}", addr);
	84	Ok(server.run()?)
	85	}
	86	}
64	87	}
65	88
66	89	fn route(&self, req: Request) -> Result<Page, errors::RuntimeError> {