nginx: properly set log actions

lzlrd · Apr 12, 2020 · ff72a50 · ff72a50
1 parent 625e8dc
commit ff72a50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/event/ngx_event_quic.c b/src/event/ngx_event_quic.c
@@ -199,8 +199,6 @@ ngx_quic_handshake(ngx_connection_t *c)
     size_t    buf_len;
     ssize_t   done;
 
-    c->log->action = "processing QUIC connection";
-
     /* Process the client's Initial packet, which was saved into c->buffer by
      * ngx_event_recvmsg(). */
     buf = c->buffer->pos;
@@ -236,6 +234,8 @@ ngx_quic_read_handler(ngx_event_t *rev)
 
     c = rev->data;
 
+    c->log->action = "reading QUIC packets";
+
     ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic read handler");
 
     if (rev->timedout) {
@@ -306,6 +306,8 @@ ngx_quic_write_handler(ngx_event_t *wev)
 
     c = wev->data;
 
+    c->log->action = "writing QUIC packets";
+
     ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic write handler");
 
     if (wev->timedout) {

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
@@ -356,6 +356,7 @@ ngx_http_init_connection(ngx_connection_t *c)
 #if (NGX_HTTP_V3)
     if (hc->addr_conf->quic) {
         hc->quic = 1;
+        c->log->action = "QUIC handshaking";
 
         /* We already have a UDP packet in the connection buffer, so we don't
          * need to wait for another read event to kick-off the handshake. */