Changeset 67c3cdbee0ef6f0708dfe5bf5343ae8b75b33610 for nntp/connection.cc

Timestamp:

08/22/10 21:55:48 (21 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

050d01b46d7ee14f1bfef6a452898e0928dea949

Parents:

563ece2aeca700b9245bc2ac709c7fd346fea911

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (08/22/10 21:55:48)

Message:

[nntp::connection] Catch exceptions from command handlers

This will mitigate, if not solve, #68.

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

Files:

• nntp/connection.cc (modified) (1 diff)

nntp/connection.cc

@@ -316 +316 @@
                         if (!arg.empty()) args.push_back(arg);
                 }
-                continuation::ptr cont = 
-                        it->second->perform(cp->shared_from_this(),
-                                            args.data(), args.size());
+                continuation::ptr cont;
+                try
+                {
+                        cont = it->second->perform(cp->shared_from_this(),
+                                                   args.data(), args.size());
+                }
+                catch (std::exception &e)
+                {
+                        logger::logline ll;
+                        ll << cp->loghead
+                           << "exception caught: "
+                           << e.what()
+                           << " (" << typeid(e).name() << ")";
+                        ll.close();
+                        cp->writebuf.clear();
+                        cp->send_line("403 server error, please try again");
+                        cont = shared_from_this();
+                }
                 cp->flush_writebuf(cont);
         }