mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-09 11:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move opening logs earlier to capture logs from Listen and .init.lua

Browse source
This commit is contained in:
Paul Kulchenko 2022-07-22 22:46:12 -07:00
parent f19347eb2f
commit 3894788097
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tool/net/redbean.c
View file

@ -1012,6 +1012,8 @@ static void ProgramHeader(const char *s) {
static void ProgramLogPath(const char *s) { static void ProgramLogPath(const char *s) {
logpath = strdup(s); logpath = strdup(s);
close(2);
open(logpath, O_APPEND | O_WRONLY | O_CREAT, 0640);
} }
static void ProgramPidPath(const char *s) { static void ProgramPidPath(const char *s) {
@ -1054,11 +1056,6 @@ static void Daemonize(void) {
WRITE(fd, ibuf, FormatInt32(ibuf, getpid()) - ibuf); WRITE(fd, ibuf, FormatInt32(ibuf, getpid()) - ibuf);
close(fd); close(fd);
} }
if (!logpath) ProgramLogPath("/dev/null");
open("/dev/null", O_RDONLY);
open(logpath, O_APPEND | O_WRONLY | O_CREAT, 0640);
dup2(1, 2);
ChangeUser();
} }
static void LogLuaError(char *hook, char *err) { static void LogLuaError(char *hook, char *err) {
@ -7310,6 +7307,8 @@ void RedBean(int argc, char *argv[]) {
close(i); close(i);
} }
} }
open("/dev/null", O_RDONLY);
open("/dev/null", O_WRONLY);
} }
zpath = GetProgramExecutableName(); zpath = GetProgramExecutableName();
CHECK_NE(-1, (zfd = open(zpath, O_RDONLY))); CHECK_NE(-1, (zfd = open(zpath, O_RDONLY)));
@ -7328,6 +7327,10 @@ void RedBean(int argc, char *argv[]) {
if (uniprocess) { if (uniprocess) {
shared->workers = 1; shared->workers = 1;
} }
if (daemonize) {
if (!logpath) ProgramLogPath("/dev/null");
dup2(2, 1);
}
SigInit(); SigInit();
Listen(); Listen();
TlsInit(); TlsInit();
@ -7336,13 +7339,8 @@ void RedBean(int argc, char *argv[]) {
} }
if (daemonize) { if (daemonize) {
Daemonize(); Daemonize();
} else {
if (logpath) {
close(2);
open(logpath, O_APPEND | O_WRONLY | O_CREAT, 0640);
}
ChangeUser();
} }
ChangeUser();
UpdateCurrentDate(nowl()); UpdateCurrentDate(nowl());
CollectGarbage(); CollectGarbage();
hdrbuf.n = 4 * 1024; hdrbuf.n = 4 * 1024;