Skip to content

check nginx daemon state before setting new event timer #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ruslanti merged 1 commit into from
Jul 1, 2025
Merged

check nginx daemon state before setting new event timer #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions nginx_module/src/http_request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,10 @@ impl<'a> HttpRequest<'a> {
unsafe { NgxStr::from_raw(self.0.schema) }
}

pub fn uri_method(&self) -> NgxStr {
unsafe { NgxStr::from_raw(self.0.method_name) }
}

pub fn request_line(&self) -> NgxStr {
unsafe { NgxStr::from_raw(self.0.request_line) }
}
Expand Down
31 changes: 27 additions & 4 deletions nginx_module/src/unix_socket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,13 @@ impl UnixSocket {
Box::new(MaybeUninit::zeroed().assume_init());
ev.handler = Some(on_reconnect_timeout);
ev.log = (*ngx_cycle).log;
ngx_event_add_timer(&mut *ev, MIN_TIMEOUT_MS);
if (*ev).timer_set() == 0
&& ngx_quit == 0
&& ngx_exiting == 0
&& ngx_terminate == 0
{
ngx_event_add_timer(&mut *ev, MIN_TIMEOUT_MS);
}
Comment on lines +86 to +92
Copy link

Copilot AI Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] The timer-setup guard logic is duplicated across multiple methods. Consider extracting this into a helper like add_timer_if_allowed(ev: &mut ngx_event_t, timeout: u64) to reduce repetition and improve readability.

Suggested change
if (*ev).timer_set() == 0
&& ngx_quit == 0
&& ngx_exiting == 0
&& ngx_terminate == 0
{
ngx_event_add_timer(&mut *ev, MIN_TIMEOUT_MS);
}
add_timer_if_allowed(&mut *ev, MIN_TIMEOUT_MS);

Copilot uses AI. Check for mistakes.
State::Disconnected { event: ev, reconnect_timeout: MIN_TIMEOUT_MS }
},
}
Expand All @@ -92,7 +98,13 @@ impl UnixSocket {
let mut ev: Box<ngx_event_t> = Box::new(MaybeUninit::zeroed().assume_init());
ev.handler = Some(on_reconnect_timeout);
ev.log = (*ngx_cycle).log;
ngx_event_add_timer(&mut *ev, MIN_TIMEOUT_MS);
if (*ev).timer_set() == 0
&& ngx_quit == 0
&& ngx_exiting == 0
&& ngx_terminate == 0
{
ngx_event_add_timer(&mut *ev, MIN_TIMEOUT_MS);
}
State::Disconnected { event: ev, reconnect_timeout: MIN_TIMEOUT_MS }
},
};
Expand Down Expand Up @@ -292,7 +304,13 @@ impl Inner {
ev.log = (*ngx_cycle).log;
ev.data = (self as *const Self as *mut Self).cast();

ngx_event_add_timer(&mut *ev, 0);
if (*ev).timer_set() == 0
&& ngx_quit == 0
&& ngx_exiting == 0
&& ngx_terminate == 0
{
ngx_event_add_timer(&mut *ev, 0);
}

ev
}
Expand Down Expand Up @@ -323,7 +341,12 @@ impl WriteBuffers {
return Err(Disconnected);
}
BufferSendResult::Again => {
ngx_event_add_timer((*conn).write, TIMEOUT_MS);
if ngx_quit == 0
&& ngx_exiting == 0
&& ngx_terminate == 0
{
ngx_event_add_timer((*conn).write, TIMEOUT_MS);
}
if ngx_handle_write_event((*conn).write, 0) != NGX_OK as isize {
return Err(Disconnected);
}
Expand Down