Changeset ae733bf09b727f294ead488db5ac953eb50f20d8

Timestamp:

06/26/10 15:13:59 (2 years ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

8d4f7f7d0239d22536f28b4900b2931d40a8537f

Parents:

72ebe081314754cf0300ebd5b8969fac31b3330e

git-author:

Antti-Juhani Kaijanaho <antti-juhani@…> (06/26/10 14:08:26)

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (06/26/10 15:13:59)

Message:

[nntp::connection::tick] Kill idle connections (timeout at 2 hours)

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

Files:

• http/connection.cc (modified) (1 diff)
• http/connection.hh (modified) (2 diffs)
• nntp/connection.cc (modified) (6 diffs)
• nntp/connection.hh (modified) (1 diff)
• server.cc (modified) (3 diffs)
• server.hh (modified) (3 diffs)
• smtp_client/smtp_client.cc (modified) (3 diffs)
• smtp_client/smtp_client.hh (modified) (2 diffs)
• tls/session.hh (modified) (2 diffs)
• tls/session_impl.hh (modified) (2 diffs)

http/connection.cc

@@ -348 +348 @@
         }
 
-        void connection::tick()
+        void connection::tick(bool)
         {
                 // FIXME

http/connection.hh

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -86 +86 @@
                 boost::asio::streambuf readbuf;
 
-                void tick();
+                void tick(bool);
 
                 void accept(boost::system::error_code ec);

nntp/connection.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -93 +93 @@
         void connection::kill()
         {
-                tick();
+                stats();
+                speer.kill();
+                peer.cancel();
                 srv_cb.terminal(shared_from_this());
                 // reset these pointers to break pointer loops
@@ -179 +181 @@
                 using boost::bind;
                 using boost::asio::buffer;
+
+                if (!cont)
+                {
+                        logger::logline ll;
+                        ll << loghead << "has a null continuation";
+                        return;
+                }
 
                 // to work around a weird bug in the TLS wrapper...
@@ -510 +519 @@
         connection::command::~command() {}
 
-        void connection::tick()
-        {
+        void connection::stats()
+        {
+                using namespace boost::posix_time;
+                ptime now = second_clock::universal_time();
+                time_duration idle = now - client_activity_timestamp;
+
                 logger::logline ll;
                 ll << loghead 
@@ -517 +530 @@
                    << (capabilities_used ? "CAPABILITIES; " : "")
                    << "age " 
-                   << boost::posix_time::second_clock::universal_time() -
-                        startup_timestamp
+                   << now - startup_timestamp
                    << ", no client activity in "
-                   << boost::posix_time::second_clock::universal_time() -
-                        client_activity_timestamp
+                   << idle
                    << "; "
                    << num_commands_served 
@@ -529 +540 @@
                    << (identified ? "identified; " : "not identified; ")
                    << (authenticated ? "authenticated" : "not authenticated");
-                ll.close();
+        }
+
+        void connection::tick(bool log)
+        {
+                if (log) stats();
+                using namespace boost::posix_time;
+                ptime now = second_clock::universal_time();
+                time_duration idle = now - client_activity_timestamp;
+                if (idle > hours(2) && dispatch)
+                {
+                        logger::logline ll;
+                        ll << loghead
+                           << "dropping idle connection";
+                        ll.close();
+                        terminate.reset();
+                        dispatch.reset();
+                        starttls.reset();
+                        kill();
+                }
         }
 

nntp/connection.hh

@@ -253 +253 @@
                 void flush_writebuf(continuation::ptr cont);
 
-                void tick();
+                void stats();
+                void tick(bool);
                 void kill();
 

server.cc

@@ -28 +28 @@
 #include "smtp_client/smtp_client.hh"
 
+#include <boost/date_time.hpp>
 #include <boost/system/system_error.hpp>
 #include <boost/shared_ptr.hpp>
@@ -110 +111 @@
 
 
-        timer.expires_from_now(boost::posix_time::seconds(10));
+        timer.expires_from_now(boost::posix_time::seconds(30));
         timer.async_wait(boost::bind(&server::tick_handler, this, _1));
 }
@@ -130 +131 @@
 void server::tick_handler(boost::system::error_code)
 {
-        smtpc->tick();
-        logger::logline ll;
-        ll << "server statistics: "
-           << active.size()
-           << " open connections";
-        ll.close();
+        using namespace boost::posix_time;
+        ptime now = second_clock::universal_time();
+        bool stats = now - latest_logged_statistics > minutes(30);
+        if (stats) latest_logged_statistics = now;
+        smtpc->tick(stats);
+        if (stats)
+        {
+                logger::logline ll;
+                ll << "server statistics: "
+                   << active.size()
+                   << " open connections";
+        }
         for (std::set<boost::shared_ptr<connection> >::iterator it =
                      active.begin();
              it != active.end(); it++)
         {
-                (*it)->tick();
+                (*it)->tick(stats);
         }
         logger::logger.flush();
-        timer.expires_from_now(boost::posix_time::seconds(600));
+        timer.expires_from_now(boost::posix_time::seconds(30));
         timer.async_wait(boost::bind(&server::tick_handler, this, _1));
 }

server.hh

@@ -26 +26 @@
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
+#include <boost/date_time.hpp>
 #include <boost/shared_ptr.hpp>
 #include <fstream>
@@ -49 +50 @@
                 virtual boost::shared_ptr<connection_factory>
                 get_factory() const = 0;
-                virtual void tick() = 0;
+                virtual void tick(bool stats) = 0;
         };
 
@@ -109 +110 @@
         boost::asio::io_service::strand strand;
         boost::asio::deadline_timer timer;
+        boost::posix_time::ptime latest_logged_statistics;
 
         typedef

smtp_client/smtp_client.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -69 +69 @@
         }
 
-        void smtp_client::tick()
+        void smtp_client::tick(bool)
         {
                 size_t n = 0;
@@ -86 +86 @@
                 if (active) async_run_queue();
 
-                logger::logline ll;
-                ll << "activated " << n << " deferred emails";
+                if (n > 0)
+                {
+                        logger::logline ll;
+                        ll << "activated " << n << " deferred emails";
+                }
         }
 

smtp_client/smtp_client.hh

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -105 +105 @@
                 void send_mail(const std::list<std::string> &recipients,
                                std::string message);
-                void tick();
+                void tick(bool);
         };
 }

tls/session.hh

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -267 +267 @@
                 ~session() { impl->kill(); }
 
+                void kill() { impl->kill(); }
+
                 template <typename Handler>
                 void async_handshake(Handler h) { impl->async_handshake(h); }

tls/session_impl.hh

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -52 +52 @@
         void session_impl<Stream>::kill()
         {
+                kill_pending_actions();
                 stream.cancel();
         }