#include <utility>
#include <vector>
+#include "accesslog.h"
#include "log.h"
#include "markpool.h"
#include "mutexlock.h"
using namespace std;
+extern AccessLogThread *access_log;
+
Server::Server()
{
pthread_mutex_init(&mutex, NULL);
Server::~Server()
{
+ for (map<string, Stream *>::iterator stream_it = streams.begin();
+ stream_it != streams.end();
+ ++stream_it) {
+ delete stream_it->second;
+ }
+
int ret;
do {
ret = close(epoll_fd);
switch (status) {
case RP_OUT_OF_SPACE:
- log(WARNING, "fd %d sent overlong request!", client->sock);
+ log(WARNING, "[%s] Client sent overlong request!", client->remote_addr.c_str());
close_client(client);
return;
case RP_NOT_FINISHED_YET:
// See if there's more data for us.
goto read_request_again;
case RP_EXTRA_DATA:
- log(WARNING, "fd %d had junk data after request!", client->sock);
+ log(WARNING, "[%s] Junk data after request!", client->remote_addr.c_str());
close_client(client);
return;
case RP_FINISHED:
return;
}
if (bytes_to_send > stream->backlog_size) {
- log(WARNING, "fd %d lost %lld bytes, maybe too slow connection",
- client->sock,
+ log(WARNING, "[%s] Client lost %lld bytes, maybe too slow connection",
+ client->remote_addr.c_str(),
(long long int)(bytes_to_send - stream->backlog_size));
client->stream_pos = stream->bytes_received - stream->backlog_size;
client->bytes_lost += bytes_to_send - stream->backlog_size;
}
}
+ // Log to access_log.
+ access_log->write(client->get_stats());
+
// Bye-bye!
int ret;
do {