Skip to content

Commit 4d1e416

Browse files
committed
use fetch logging scope, clean some comments
1 parent 3badcdb commit 4d1e416

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/browser/fetch/fetch.zig

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,11 @@ pub fn fetch(input: RequestInput, options: ?RequestInit, page: *Page) !Env.Promi
8585
const arena = page.arena;
8686

8787
const req = try Request.constructor(input, options, page);
88-
89-
const resolver = page.main_context.createPersistentPromiseResolver();
90-
9188
var headers = try Http.Headers.init();
9289

9390
// Copy our headers into the HTTP headers.
9491
var header_iter = req.headers.headers.iterator();
9592
while (header_iter.next()) |entry| {
96-
// This is fine because curl/headers copies it internally.
9793
const combined = try std.fmt.allocPrintSentinel(
9894
page.arena,
9995
"{s}: {s}",
@@ -105,6 +101,8 @@ pub fn fetch(input: RequestInput, options: ?RequestInit, page: *Page) !Env.Promi
105101

106102
try page.requestCookie(.{}).headersForRequest(arena, req.url, &headers);
107103

104+
const resolver = page.main_context.createPersistentPromiseResolver();
105+
108106
const fetch_ctx = try arena.create(FetchContext);
109107
fetch_ctx.* = .{
110108
.arena = arena,
@@ -126,7 +124,7 @@ pub fn fetch(input: RequestInput, options: ?RequestInit, page: *Page) !Env.Promi
126124
.start_callback = struct {
127125
fn startCallback(transfer: *HttpClient.Transfer) !void {
128126
const self: *FetchContext = @ptrCast(@alignCast(transfer.ctx));
129-
log.debug(.http, "request start", .{ .method = self.method, .url = self.url, .source = "fetch" });
127+
log.debug(.fetch, "request start", .{ .method = self.method, .url = self.url, .source = "fetch" });
130128

131129
self.transfer = transfer;
132130
}
@@ -137,7 +135,7 @@ pub fn fetch(input: RequestInput, options: ?RequestInit, page: *Page) !Env.Promi
137135

138136
const header = &transfer.response_header.?;
139137

140-
log.debug(.http, "request header", .{
138+
log.debug(.fetch, "request header", .{
141139
.source = "fetch",
142140
.method = self.method,
143141
.url = self.url,
@@ -175,7 +173,7 @@ pub fn fetch(input: RequestInput, options: ?RequestInit, page: *Page) !Env.Promi
175173
defer self.promise_resolver.deinit();
176174
self.transfer = null;
177175

178-
log.info(.http, "request complete", .{
176+
log.info(.fetch, "request complete", .{
179177
.source = "fetch",
180178
.method = self.method,
181179
.url = self.url,
@@ -192,7 +190,7 @@ pub fn fetch(input: RequestInput, options: ?RequestInit, page: *Page) !Env.Promi
192190
defer self.promise_resolver.deinit();
193191
self.transfer = null;
194192

195-
log.err(.http, "error", .{
193+
log.err(.fetch, "error", .{
196194
.url = self.url,
197195
.err = err,
198196
.source = "fetch error",

src/log.zig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ pub const Scope = enum {
3939
unknown_prop,
4040
web_api,
4141
xhr,
42+
fetch,
4243
polyfill,
4344
mouse_event,
4445
};

0 commit comments

Comments
 (0)