Ticket #123: network_errors.patch

net/remoteserver.cc

@@ -200 +200 @@
                 throw Xapian::InvalidArgumentError(errmsg);
             }
             (this->*(dispatch[type]))(message);
+        } catch (const Xapian::NetworkTimeoutError & e) {
+            try {
+                // We've had a timeout, so the client may not be listening, so
+                // if we can't send the message right away, just exit and the
+                // client will cope.
+                RemoteConnection::send_message(REPLY_EXCEPTION, serialise_error(e), OmTime::now());
+            } catch (...) {
+            }
+            // but this really isn't an 'error' - particularly when an 'idle'
+            // timeout (maybe making this distinction is worthwhile?).  For
+            // now, just close the connection and silently return - no
+            // message will be logged.
+            return;
+        } catch (const Xapian::NetworkError) {
+            // All other network errors mean we are fatally confused - we
+            // can't recover from a single missed byte - so no point trying
+            // to serialize the error. Let top-level handler log a message
+            // before closing the connection.
+            throw;
         } catch (const Xapian::Error &e) {
             // Propagate the exception across the connection, then return to
             // the main message handling loop.