Changeset 8fab37d78032b4009b127dc2d5c06b71a627ebd5

Timestamp:

08/28/10 23:47:53 (18 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

62231ec0359b34f6a82b6688a7af97f2eb2ede10

Parents:

e044cc70b8bbba183fdf396ddbc00b2407eb5bea

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (08/28/10 23:47:53)

Message:

[http::connection] Kill idle connections.

Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani@…>

Location:

http

Files:

• connection.cc (modified) (6 diffs)
• connection.hh (modified) (1 diff)

http/connection.cc

@@ -45 +45 @@
                 , startup_timestamp
                   (boost::posix_time::second_clock::universal_time())
+                , request_timestamp(startup_timestamp)
+                , num_requests(0)
+                , idle(false)
         {
                 acc.async_accept(peer, ep,
@@ -116 +119 @@
                 if (ec) { abort(self, ec); return; }
 
+                self->idle = true;
+
                 async_read_until(self->speer, self->readbuf, "\r\n\r\n",
                                  bind(&connection::got_request,
@@ -130 +135 @@
                 using boost::bind;
                 using boost::shared_ptr;
+
+                self->idle = false;
+                ++self->num_requests;
 
                 if (ec == boost::asio::error::eof)
@@ -255 +263 @@
                 }
 
-                boost::posix_time::ptime reqtime = boost::posix_time::microsec_clock::universal_time();
+                self->request_timestamp =
+                        boost::posix_time::microsec_clock::universal_time();
 
                 if (self->srv_cb.do_log_protocol_details())
@@ -317 +326 @@
                 ll << self->loghead << (req ? req->logbit() : "") << " " 
                    << resp->logbit()
-                   << "; " << boost::posix_time::microsec_clock::universal_time() - reqtime; 
+                   << "; "
+                   << boost::posix_time::microsec_clock::universal_time() -
+                        self->request_timestamp;
                 ll.close();
 
@@ -349 +360 @@
         }
 
-        void connection::tick(bool)
-        {
-                // FIXME
+        void connection::tick(bool stats)
+        {
+                using namespace boost::posix_time;
+                ptime now = microsec_clock::universal_time();
+                bool kill = idle && num_requests != 0 &&
+                        now - request_timestamp > minutes(10);
+
+                if (stats || kill)
+                {
+                        logger::logline ll;
+                        ll << loghead
+                           << " age "
+                           << now - startup_timestamp
+                           << "; "
+                           << (idle ? "idle " : "busy ")
+                           << now - request_timestamp
+                           << "; served " << num_requests << " requests";
+                        if (kill) ll << "; killing";
+                }
+                if (kill) speer.kill();
         }
 

http/connection.hh

@@ -83 +83 @@
 
                 boost::posix_time::ptime startup_timestamp;
+                boost::posix_time::ptime request_timestamp;
+                size_t num_requests;
+                bool idle;
 
                 boost::asio::streambuf readbuf;