Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 15 additions & 6 deletions src/browser/page.zig
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
}

Expand Down
9 changes: 6 additions & 3 deletions src/browser/xhr/xhr.zig
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;
Expand Down