commit 4604dc9671fc46832928fb9f6ab83aaee55931d8 from: Omar Polo date: Tue Feb 23 12:43:33 2021 UTC move vhost_should_log call to server.c log.o is linked to some regress/ stuff. Calling from there a vhost_* function means that we should link the regress/stuff to server.o too (and that would pull in other stuff...). Moving the call is easier, and also probably better. commit - 793835cb26c39202133c754fb33f8909ebf8fb92 commit + 4604dc9671fc46832928fb9f6ab83aaee55931d8 blob - b47444b1be80fa8e5ddde908e6fe880d6a2ed031 blob + 6bb84f131f85407de99c5dd8ce931ce60aa6ef37 --- log.c +++ log.c @@ -188,9 +188,6 @@ log_request(struct client *c, char *meta, size_t l) size_t len; int ec; - if (vhost_disable_log(c->host, c->iri.path)) - return; - len = sizeof(c->addr); ec = getnameinfo((struct sockaddr*)&c->addr, len, hbuf, sizeof(hbuf), blob - ec0762d8063e547a3c6857f46b5927ba2461e1c7 blob + bfb9dce996ce435f18a9201132997a8d6915317b --- server.c +++ server.c @@ -620,7 +620,8 @@ handle_start_reply(int fd, short ev, void *d) return; } - log_request(c, buf, sizeof(buf)); + if (!vhost_disable_log(c->host, c->iri.path)) + log_request(c, buf, sizeof(buf)); if (c->code != SUCCESS) close_conn(fd, ev, c);