refactor: add more debug message support
This commit is contained in:
@@ -581,6 +581,7 @@ fn fcgi_execute_request_handle(rq: &mut FGCIRequest) -> Result<(), Box<dyn std::
|
||||
.params
|
||||
.get("SCRIPT_FILENAME")
|
||||
.ok_or(ERR!("No SCRIPT_FILENAME found"))?;
|
||||
DEBUG!("Execute CGI script: {}", path);
|
||||
let source = std::fs::read_to_string(path)?;
|
||||
lua.load(&source).exec()?;
|
||||
Ok(())
|
||||
@@ -599,6 +600,7 @@ fn fcgi_send_stderr<T: Write>(
|
||||
padding: 0,
|
||||
};
|
||||
if let Some(error) = eopt {
|
||||
ERROR!("Error: {}", error);
|
||||
let err_str = error.to_string();
|
||||
let str_len = err_str.len();
|
||||
let mut padding = (8 - str_len % 8) as u8;
|
||||
|
||||
20
src/main.rs
20
src/main.rs
@@ -59,8 +59,8 @@ fn clean_up(n: i32) {
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_request<T: Read + Write + AsRawFd>(stream: &mut T) {
|
||||
if let Err(error) = process_request(stream) {
|
||||
fn handle_request<T: Read + Write + AsRawFd>(mut stream: T) {
|
||||
if let Err(error) = process_request(&mut stream) {
|
||||
ERROR!("Unable to process request: {}", error);
|
||||
}
|
||||
DEBUG!("Request on socket {} is processed", stream.as_raw_fd());
|
||||
@@ -89,16 +89,16 @@ fn serve(config: &Config) {
|
||||
}
|
||||
|
||||
for client in listener.incoming() {
|
||||
let mut stream = client.unwrap();
|
||||
pool.execute(move || handle_request(&mut stream));
|
||||
let stream = client.unwrap();
|
||||
pool.execute(move || handle_request(stream));
|
||||
}
|
||||
} else {
|
||||
// TCP socket eg. 127.0.0.1:9000
|
||||
INFO!("Use TCP socket: {}", socket_name);
|
||||
let listener = TcpListener::bind(socket_name).unwrap();
|
||||
for client in listener.incoming() {
|
||||
let mut stream = client.unwrap();
|
||||
pool.execute(move || handle_request(&mut stream));
|
||||
let stream = client.unwrap();
|
||||
pool.execute(move || handle_request(stream));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -111,17 +111,17 @@ fn serve(config: &Config) {
|
||||
DEBUG!("Stdin is used as Unix domain socket");
|
||||
let listener = unsafe { UnixListener::from_raw_fd(stdin.as_raw_fd()) };
|
||||
for client in listener.incoming() {
|
||||
let mut stream = client.unwrap();
|
||||
let stream = client.unwrap();
|
||||
|
||||
pool.execute(move || handle_request(&mut stream));
|
||||
pool.execute(move || handle_request(stream));
|
||||
}
|
||||
} else {
|
||||
DEBUG!("Stdin is used as TCP Socket");
|
||||
let listener = unsafe { TcpListener::from_raw_fd(stdin.as_raw_fd()) };
|
||||
for client in listener.incoming() {
|
||||
let mut stream = client.unwrap();
|
||||
let stream = client.unwrap();
|
||||
|
||||
pool.execute(move || handle_request(&mut stream));
|
||||
pool.execute(move || handle_request(stream));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user