aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fs.zig2
-rw-r--r--src/http_client_async.zig10
-rw-r--r--src/runtime.zig8
3 files changed, 14 insertions, 6 deletions
diff --git a/src/fs.zig b/src/fs.zig
index 9e92eeaa4..ede653a76 100644
--- a/src/fs.zig
+++ b/src/fs.zig
@@ -520,7 +520,7 @@ pub const FileSystem = struct {
pub var tmpdir_path_set = false;
pub fn openTmpDir(fs: *const RealFS) !std.fs.Dir {
if (!tmpdir_path_set) {
- tmpdir_path = std.os.getenv("TMPDIR") orelse PLATFORM_TMP_DIR;
+ tmpdir_path = std.os.getenvZ("BUN_TMPDIR") orelse std.os.getenvZ("TMPDIR") orelse PLATFORM_TMP_DIR;
tmpdir_path_set = true;
}
diff --git a/src/http_client_async.zig b/src/http_client_async.zig
index 192aebfbf..de8f8068a 100644
--- a/src/http_client_async.zig
+++ b/src/http_client_async.zig
@@ -19,6 +19,8 @@ const SOCKET_FLAGS: u32 = if (Environment.isLinux)
else
os.SOCK_CLOEXEC;
+const OPEN_SOCKET_FLAGS = os.SOCK_CLOEXEC;
+
const extremely_verbose = false;
fn writeRequest(
@@ -615,7 +617,13 @@ const AsyncSocket = struct {
}
fn connectToAddress(this: *AsyncSocket, address: std.net.Address) ConnectError!void {
- const sockfd = AsyncIO.openSocket(address.any.family, SOCKET_FLAGS | std.os.SOCK_STREAM, std.os.IPPROTO_TCP) catch return error.ConnectionRefused;
+ const sockfd = AsyncIO.openSocket(address.any.family, OPEN_SOCKET_FLAGS | std.os.SOCK_STREAM, std.os.IPPROTO_TCP) catch |err| {
+ if (extremely_verbose) {
+ Output.prettyErrorln("openSocket error: {s}", .{@errorName(err)});
+ }
+
+ return error.ConnectionRefused;
+ };
this.io.connect(*AsyncSocket, this, on_connect, &this.connect_completion, sockfd, address);
suspend {
diff --git a/src/runtime.zig b/src/runtime.zig
index db9954b27..337c9fdab 100644
--- a/src/runtime.zig
+++ b/src/runtime.zig
@@ -28,7 +28,7 @@ pub const ErrorCSS = struct {
.{
.read = true,
},
- ) catch unreachable;
+ ) catch @panic("Missing packages/bun-error/bun-error.css. Please run \"make bun_error\"");
defer file.close();
return file.readToEndAlloc(default_allocator, (file.stat() catch unreachable).size) catch unreachable;
} else {
@@ -53,7 +53,7 @@ pub const ErrorJS = struct {
.{
.read = true,
},
- ) catch unreachable;
+ ) catch @panic("Missing " ++ ErrorJSPath ++ ". Please run \"make bun_error\"");
defer file.close();
return file.readToEndAlloc(default_allocator, (file.stat() catch unreachable).size) catch unreachable;
} else {
@@ -114,7 +114,7 @@ pub const Fallback = struct {
env.get("USER").?,
) catch unreachable;
var runtime_path = std.fs.path.join(default_allocator, &[_]string{ dir, "fallback.out.js" }) catch unreachable;
- const file = std.fs.openFileAbsolute(runtime_path, .{}) catch unreachable;
+ const file = std.fs.openFileAbsolute(runtime_path, .{}) catch @panic("Missing bun/src/fallback.out.js. " ++ "Please run \"make fallback_decoder\"");
defer file.close();
return file.readToEndAlloc(default_allocator, (file.stat() catch unreachable).size) catch unreachable;
} else {
@@ -173,7 +173,7 @@ pub const Runtime = struct {
env.get("USER").?,
) catch unreachable;
var runtime_path = std.fs.path.join(default_allocator, &[_]string{ dir, "runtime.out.js" }) catch unreachable;
- const file = std.fs.openFileAbsolute(runtime_path, .{}) catch unreachable;
+ const file = std.fs.openFileAbsolute(runtime_path, .{}) catch @panic("Missing bun/src/runtime.out.js. " ++ "Please run \"make runtime_js_dev\"");
defer file.close();
return file.readToEndAlloc(default_allocator, (file.stat() catch unreachable).size) catch unreachable;
} else {