From 8f00317567dab4c825a0eca76a9cae7951edd11f Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Tue, 6 Dec 2011 14:15:52 +0100 Subject: Clean up the way connections are handled. --- server/src/server.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'server/src/server.cc') diff --git a/server/src/server.cc b/server/src/server.cc index e4d6474..2d2d4c9 100644 --- a/server/src/server.cc +++ b/server/src/server.cc @@ -73,7 +73,7 @@ public: { if(ptr) { Connection *connection = (Connection *)ptr; - connection->handle(data, data_size); + connection->data(data, data_size); } return true; } @@ -84,7 +84,7 @@ public: Connection *connection = (Connection *)ptr; // Flush and do commit/discards - connection->handle(NULL, 0); + if(!connection->handle()) return false; connection->getReply(reply); } -- cgit v1.2.3 From aac862e2797e9a05c64a872850bb2e9f304d6e13 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 12 Apr 2012 10:05:31 +0200 Subject: New mutex wrapped debug system. --- server/src/server.cc | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'server/src/server.cc') diff --git a/server/src/server.cc b/server/src/server.cc index 2d2d4c9..838da32 100644 --- a/server/src/server.cc +++ b/server/src/server.cc @@ -37,6 +37,9 @@ #include "client_connection.h" #include "admin_connection.h" +extern std::string logfile; +extern volatile bool logfile_reload; + class PracroHttpd : public Httpd { public: PracroHttpd() {} @@ -57,6 +60,12 @@ public: headers_t &getargs, headers_t &headers) { + if(logfile_reload) { + DEBUG(pracrod, "Reopen log file %s\n", logfile.c_str()); + debug_reinit(logfile.c_str()); + logfile_reload = false; + } + Connection *connection = NULL; if(headers.find("User-Agent") != headers.end() && -- cgit v1.2.3