From 79d1425530a9b82e7a83cb2f50192479aa2d4742 Mon Sep 17 00:00:00 2001 From: Karl Seguin Date: Wed, 28 May 2025 11:15:57 +0800 Subject: [PATCH] Reduce info logs of HTTP event In normal cases, only log a single info event HTTP request. In an error case or when log-level=debug, more may be logged. --- src/browser/page.zig | 21 +++++++++++++++------ src/browser/xhr/xhr.zig | 9 ++++++--- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/browser/page.zig b/src/browser/page.zig index 39a5279c..129673c4 100644 --- a/src/browser/page.zig +++ b/src/browser/page.zig @@ -181,7 +181,7 @@ pub const Page = struct { const session = self.session; const notification = session.browser.notification; - log.info(.page, "navigate", .{ .url = request_url, .reason = opts.reason }); + log.debug(.page, "navigate", .{ .url = request_url, .reason = opts.reason }); // if the url is about:blank, nothing to do. if (std.mem.eql(u8, "about:blank", request_url.raw)) { @@ -229,7 +229,12 @@ pub const Page = struct { break :blk Mime.sniff(try response.peek()); } orelse .unknown; - log.info(.page, "navigation header", .{ .status = header.status, .content_type = content_type, .charset = mime.charset }); + log.info(.page, "navigation", .{ + .status = header.status, + .content_type = content_type, + .charset = mime.charset, + .url = request_url, + }); if (mime.isHTML()) { self.raw_data = null; @@ -248,7 +253,7 @@ pub const Page = struct { .url = &self.url, .timestamp = timestamp(), }); - log.info(.page, "navigation complete", .{}); + log.debug(.page, "navigation complete", .{}); } // https://html.spec.whatwg.org/#read-html @@ -439,8 +444,8 @@ pub const Page = struct { var origin_url = &self.url; const url = try origin_url.resolve(arena, res_src); - log.info(.page, "fetching script", .{ .url = url }); - errdefer |err| log.err(.page, "fetch error", .{ .err = err }); + log.debug(.page, "fetching script", .{ .url = url }); + errdefer |err| log.err(.page, "fetch error", .{ .err = err, .url = url }); var request = try self.newHTTPRequest(.GET, &url, .{ .origin_uri = &origin_url.uri, @@ -468,7 +473,11 @@ pub const Page = struct { return null; } - log.info(.page, "fetch complete", .{ .status = header.status, .content_length = arr.items.len }); + log.info(.page, "fetch complete", .{ + .url = url, + .status = header.status, + .content_length = arr.items.len, + }); return arr.items; } diff --git a/src/browser/xhr/xhr.zig b/src/browser/xhr/xhr.zig index eb71b5fa..594f1a72 100644 --- a/src/browser/xhr/xhr.zig +++ b/src/browser/xhr/xhr.zig @@ -412,7 +412,7 @@ pub const XMLHttpRequest = struct { if (self.state != .opened) return DOMError.InvalidState; if (self.send_flag) return DOMError.InvalidState; - log.info(.xhr, "request", .{ .method = self.method, .url = self.url }); + log.debug(.xhr, "request", .{ .method = self.method, .url = self.url }); self.send_flag = true; @@ -459,7 +459,7 @@ pub const XMLHttpRequest = struct { if (progress.first) { const header = progress.header; - log.info(.xhr, "request header", .{ .status = header.status }); + log.debug(.xhr, "request header", .{ .status = header.status }); for (header.headers.items) |hdr| { try self.response_headers.append(hdr.name, hdr.value); } @@ -505,7 +505,10 @@ pub const XMLHttpRequest = struct { return; } - log.info(.xhr, "request complete", .{}); + log.info(.xhr, "request complete", .{ + .url = self.url, + .status = progress.header.status, + }); self.state = .done; self.send_flag = false;