mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-26 12:30:30 +00:00
Improve logger API (#262)
This breaking change improves naming consistency. - Rename LOGF to INFOF - Rename recently introduced ANYF to LOGF - Remove V* log calls, as they are not being used
This commit is contained in:
Paul Kulchenko
GitHub
parent
50937be752
commit
0584684a82
13 changed files with 174 additions and 261 deletions
|
|
@ -130,7 +130,7 @@ void AddSocket(const struct Socket *s) {
|
|||
|
||||
void RemoveSocket(size_t i) {
|
||||
DCHECK_LT(i, g_sockets.i);
|
||||
LOGF("removing: %s", gc(DescribeSocket(&g_sockets.p[i])));
|
||||
INFOF("removing: %s", gc(DescribeSocket(&g_sockets.p[i])));
|
||||
CHECK_NE(-1, close(g_sockets.p[i].fd));
|
||||
while (g_sockets.p[i].egress.i) {
|
||||
free(g_sockets.p[i].egress.p[g_sockets.p[i].egress.i - 1].data.iov_base);
|
||||
|
|
@ -189,7 +189,7 @@ void BeginListeningForIncomingTraffic(void) {
|
|||
}
|
||||
uint32_t addrsize = sizeof(s->addr);
|
||||
CHECK_NE(-1, getsockname(s->fd, &s->addr, &addrsize));
|
||||
LOGF("listening on %s", gc(DescribeSocket(s)));
|
||||
INFOF("listening on %s", gc(DescribeSocket(s)));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -202,8 +202,8 @@ void AcceptConnection(size_t i) {
|
|||
client.protocol = server->protocol;
|
||||
uint32_t addrsize = sizeof(client.addr);
|
||||
CHECK_NE(-1L, (client.fd = accept(server->fd, &client.addr, &addrsize)));
|
||||
LOGF("%s accepted %s", gc(DescribeSocket(server)),
|
||||
gc(DescribeSocket(&client)));
|
||||
INFOF("%s accepted %s", gc(DescribeSocket(server)),
|
||||
gc(DescribeSocket(&client)));
|
||||
AddSocket(&client);
|
||||
}
|
||||
|
||||
|
|
@ -219,8 +219,8 @@ bool ReceiveData(size_t i) {
|
|||
msg.data.iov_len, 0, isudp ? &msg.dest : NULL,
|
||||
isudp ? &msg.destsize : NULL)));
|
||||
if (0 < got && got <= msg.data.iov_len) {
|
||||
LOGF("%s received %lu bytes from %s", gc(DescribeSocket(&g_sockets.p[i])),
|
||||
got, gc(DescribeAddress(&msg.dest)));
|
||||
INFOF("%s received %lu bytes from %s", gc(DescribeSocket(&g_sockets.p[i])),
|
||||
got, gc(DescribeAddress(&msg.dest)));
|
||||
msg.data.iov_base = xrealloc(msg.data.iov_base, (msg.data.iov_len = got));
|
||||
append(&g_sockets.p[i].egress, &msg);
|
||||
g_polls.p[i].events |= POLLOUT;
|
||||
|
|
@ -241,8 +241,8 @@ void SendData(size_t i) {
|
|||
CHECK_NE(-1L, (sent = sendto(s->fd, msg->data.iov_base, msg->data.iov_len, 0,
|
||||
isudp ? &msg->dest : NULL,
|
||||
isudp ? msg->destsize : 0)));
|
||||
LOGF("%s sent %lu bytes to %s", gc(DescribeSocket(s)), msg->data.iov_len,
|
||||
gc(DescribeAddress(&msg->dest)));
|
||||
INFOF("%s sent %lu bytes to %s", gc(DescribeSocket(s)), msg->data.iov_len,
|
||||
gc(DescribeAddress(&msg->dest)));
|
||||
if (!(msg->data.iov_len -= min((size_t)sent, (size_t)msg->data.iov_len))) {
|
||||
free_s(&msg->data.iov_base);
|
||||
if (!--s->egress.i) {
|
||||
|
|
@ -290,7 +290,7 @@ int main(int argc, char *argv[]) {
|
|||
memset(&icall, 0, sizeof(icall));
|
||||
interruptiblecall(&icall, (void *)EchoServer, 0, 0, 0, 0);
|
||||
fputc('\r', stderr);
|
||||
LOGF("%s", "shutting down...");
|
||||
INFOF("%s", "shutting down...");
|
||||
size_t i;
|
||||
for (i = g_sockets.i; i; --i) RemoveSocket(i - 1);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -1118,7 +1118,7 @@ static void ReportWorkerResources(int pid, struct rusage *ru) {
|
|||
AppendResourceReport(&b, ru, "\n");
|
||||
if (b) {
|
||||
if ((s = IndentLines(b, appendz(b).i - 1, 0, 1))) {
|
||||
ANYF(kLogDebug, "(stat) resource report for pid %d\n%s", pid, s);
|
||||
LOGF(kLogDebug, "(stat) resource report for pid %d\n%s", pid, s);
|
||||
free(s);
|
||||
}
|
||||
free(b);
|
||||
|
|
@ -3470,7 +3470,7 @@ static void LogMessage(const char *d, const char *s, size_t n) {
|
|||
while (n && (s[n - 1] == '\r' || s[n - 1] == '\n')) --n;
|
||||
if ((s2 = DecodeLatin1(s, n, &n2))) {
|
||||
if ((s3 = IndentLines(s2, n2, &n3, 1))) {
|
||||
LOGF("(stat) %s %,ld byte message\n%.*s", d, n, n3, s3);
|
||||
INFOF("(stat) %s %,ld byte message\n%.*s", d, n, n3, s3);
|
||||
free(s3);
|
||||
}
|
||||
free(s2);
|
||||
|
|
@ -3485,7 +3485,7 @@ static void LogBody(const char *d, const char *s, size_t n) {
|
|||
while (n && (s[n - 1] == '\r' || s[n - 1] == '\n')) --n;
|
||||
if ((s2 = VisualizeControlCodes(s, n, &n2))) {
|
||||
if ((s3 = IndentLines(s2, n2, &n3, 1))) {
|
||||
LOGF("(stat) %s %,ld byte payload\n%.*s", d, n, n3, s3);
|
||||
INFOF("(stat) %s %,ld byte payload\n%.*s", d, n, n3, s3);
|
||||
free(s3);
|
||||
}
|
||||
free(s2);
|
||||
|
|
@ -5373,8 +5373,8 @@ static const char *DescribeClose(void) {
|
|||
static void LogClose(const char *reason) {
|
||||
if (amtread || meltdown || killed) {
|
||||
LockInc(&shared->c.fumbles);
|
||||
LOGF("(stat) %s %s with %,ld unprocessed and %,d handled (%,d workers)",
|
||||
DescribeClient(), reason, amtread, messageshandled, shared->workers);
|
||||
INFOF("(stat) %s %s with %,ld unprocessed and %,d handled (%,d workers)",
|
||||
DescribeClient(), reason, amtread, messageshandled, shared->workers);
|
||||
} else {
|
||||
DEBUGF("(stat) %s %s with %,d requests handled", DescribeClient(), reason,
|
||||
messageshandled);
|
||||
|
|
@ -5513,7 +5513,7 @@ static char *HandlePayloadReadError(void) {
|
|||
return ServeFailure(408, "Request Timeout");
|
||||
} else {
|
||||
LockInc(&shared->c.readerrors);
|
||||
LOGF("(clnt) %s payload read error %s", DescribeClient(), strerror(errno));
|
||||
INFOF("(clnt) %s payload read error %s", DescribeClient(), strerror(errno));
|
||||
return ServeFailure(500, "Internal Server Error");
|
||||
}
|
||||
}
|
||||
|
|
@ -5775,11 +5775,11 @@ static char *HandleRequest(void) {
|
|||
LockInc(&shared->c.urisrefused);
|
||||
return ServeFailure(400, "Bad URI");
|
||||
}
|
||||
LOGF("(req) received %s HTTP%02d %.*s %s %`'.*s %`'.*s", DescribeClient(),
|
||||
msg.version, msg.xmethod.b - msg.xmethod.a, inbuf.p + msg.xmethod.a,
|
||||
FreeLater(EncodeUrl(&url, 0)), HeaderLength(kHttpReferer),
|
||||
HeaderData(kHttpReferer), HeaderLength(kHttpUserAgent),
|
||||
HeaderData(kHttpUserAgent));
|
||||
INFOF("(req) received %s HTTP%02d %.*s %s %`'.*s %`'.*s", DescribeClient(),
|
||||
msg.version, msg.xmethod.b - msg.xmethod.a, inbuf.p + msg.xmethod.a,
|
||||
FreeLater(EncodeUrl(&url, 0)), HeaderLength(kHttpReferer),
|
||||
HeaderData(kHttpReferer), HeaderLength(kHttpUserAgent),
|
||||
HeaderData(kHttpUserAgent));
|
||||
if (HasHeader(kHttpContentType) &&
|
||||
IsMimeType(HeaderData(kHttpContentType), HeaderLength(kHttpContentType),
|
||||
"application/x-www-form-urlencoded")) {
|
||||
|
|
@ -6094,7 +6094,7 @@ static bool HandleMessageAcutal(void) {
|
|||
LockInc(&shared->c.badmessages);
|
||||
connectionclose = true;
|
||||
if ((p = DumpHexc(inbuf.p, MIN(amtread, 256), 0))) {
|
||||
LOGF("(clnt) %s sent garbage %s", DescribeClient(), p);
|
||||
INFOF("(clnt) %s sent garbage %s", DescribeClient(), p);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
@ -6122,7 +6122,7 @@ static bool HandleMessageAcutal(void) {
|
|||
LockInc(&shared->c.messageshandled);
|
||||
++messageshandled;
|
||||
if (loglatency || LOGGABLE(kLogDebug)) {
|
||||
ANYF(kLogDebug, "(stat) %`'.*s latency %,ldµs", msg.uri.b - msg.uri.a, inbuf.p + msg.uri.a,
|
||||
LOGF(kLogDebug, "(stat) %`'.*s latency %,ldµs", msg.uri.b - msg.uri.a, inbuf.p + msg.uri.a,
|
||||
(long)((nowl() - startrequest) * 1e6L));
|
||||
}
|
||||
if (!generator) {
|
||||
|
|
@ -6473,8 +6473,8 @@ static void Listen(void) {
|
|||
port = ntohs(servers.p[n].addr.sin_port);
|
||||
ip = ntohl(servers.p[n].addr.sin_addr.s_addr);
|
||||
if (ip == INADDR_ANY) ip = INADDR_LOOPBACK;
|
||||
LOGF("(srvr) listen http://%hhu.%hhu.%hhu.%hhu:%d", ip >> 24, ip >> 16, ip >> 8,
|
||||
ip, port);
|
||||
INFOF("(srvr) listen http://%hhu.%hhu.%hhu.%hhu:%d", ip >> 24, ip >> 16, ip >> 8,
|
||||
ip, port);
|
||||
if (printport && !ports.p[j]) {
|
||||
printf("%d\n", port);
|
||||
fflush(stdout);
|
||||
|
|
@ -6493,9 +6493,9 @@ static void Listen(void) {
|
|||
static void HandleShutdown(void) {
|
||||
CloseServerFds();
|
||||
if (keyboardinterrupt) {
|
||||
LOGF("(srvr) received keyboard interrupt");
|
||||
INFOF("(srvr) received keyboard interrupt");
|
||||
} else {
|
||||
LOGF("(srvr) received term signal");
|
||||
INFOF("(srvr) received term signal");
|
||||
if (!killed) {
|
||||
terminated = false;
|
||||
}
|
||||
|
|
@ -6688,7 +6688,7 @@ void RedBean(int argc, char *argv[]) {
|
|||
TlsDestroy();
|
||||
MemDestroy();
|
||||
}
|
||||
LOGF("(srvr) shutdown complete");
|
||||
INFOF("(srvr) shutdown complete");
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue