mirror of
https://github.com/jetzig-framework/jetzig.git
synced 2025-05-15 06:26:07 +00:00
Remove unneeded filesystem lookup
`root_path` is cruft from previous route/template matching mechanism. Caused failure when running binary in isolation: binary can now run independently without any dependency on file system other than: ``` * public/ <-- should always be separate to allow e.g. serving directly via nginx * static/ <-- later will be compiled into binary ```
This commit is contained in:
parent
0bd26cd759
commit
bc64f58c44
@ -53,16 +53,6 @@ pub fn init(allocator: std.mem.Allocator) !App {
|
|||||||
true => caches.Cache{ .memory_cache = caches.MemoryCache.init(allocator) },
|
true => caches.Cache{ .memory_cache = caches.MemoryCache.init(allocator) },
|
||||||
false => caches.Cache{ .null_cache = caches.NullCache.init(allocator) },
|
false => caches.Cache{ .null_cache = caches.NullCache.init(allocator) },
|
||||||
};
|
};
|
||||||
const root_path = std.fs.cwd().realpathAlloc(allocator, "src/app") catch |err| {
|
|
||||||
switch (err) {
|
|
||||||
error.FileNotFound => {
|
|
||||||
std.debug.print("Unable to find base directory: ./app\nExiting.\n", .{});
|
|
||||||
std.os.exit(1);
|
|
||||||
},
|
|
||||||
else => return err,
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
var logger = loggers.Logger{ .development_logger = loggers.DevelopmentLogger.init(allocator) };
|
var logger = loggers.Logger{ .development_logger = loggers.DevelopmentLogger.init(allocator) };
|
||||||
const secret = try generateSecret(allocator);
|
const secret = try generateSecret(allocator);
|
||||||
logger.debug(
|
logger.debug(
|
||||||
@ -73,7 +63,6 @@ pub fn init(allocator: std.mem.Allocator) !App {
|
|||||||
const server_options = http.Server.ServerOptions{
|
const server_options = http.Server.ServerOptions{
|
||||||
.cache = server_cache,
|
.cache = server_cache,
|
||||||
.logger = logger,
|
.logger = logger,
|
||||||
.root_path = root_path,
|
|
||||||
.secret = secret,
|
.secret = secret,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -82,7 +71,6 @@ pub fn init(allocator: std.mem.Allocator) !App {
|
|||||||
.allocator = allocator,
|
.allocator = allocator,
|
||||||
.host = host,
|
.host = host,
|
||||||
.port = port,
|
.port = port,
|
||||||
.root_path = root_path,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,7 +9,6 @@ server_options: jetzig.http.Server.ServerOptions,
|
|||||||
allocator: std.mem.Allocator,
|
allocator: std.mem.Allocator,
|
||||||
host: []const u8,
|
host: []const u8,
|
||||||
port: u16,
|
port: u16,
|
||||||
root_path: []const u8,
|
|
||||||
|
|
||||||
pub fn deinit(self: Self) void {
|
pub fn deinit(self: Self) void {
|
||||||
_ = self;
|
_ = self;
|
||||||
@ -59,7 +58,6 @@ pub fn start(self: Self, comptime_routes: []jetzig.views.Route) !void {
|
|||||||
);
|
);
|
||||||
|
|
||||||
defer server.deinit();
|
defer server.deinit();
|
||||||
defer self.allocator.free(self.root_path);
|
|
||||||
defer self.allocator.free(self.host);
|
defer self.allocator.free(self.host);
|
||||||
defer self.allocator.free(server.options.secret);
|
defer self.allocator.free(server.options.secret);
|
||||||
|
|
||||||
|
@ -13,7 +13,6 @@ else
|
|||||||
pub const ServerOptions = struct {
|
pub const ServerOptions = struct {
|
||||||
cache: jetzig.caches.Cache,
|
cache: jetzig.caches.Cache,
|
||||||
logger: jetzig.loggers.Logger,
|
logger: jetzig.loggers.Logger,
|
||||||
root_path: []const u8,
|
|
||||||
secret: []const u8,
|
secret: []const u8,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user