From 79e358ce6d2a2c34f365c24d68ddbab7461380f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 16 Oct 2018 23:36:15 +0200
Subject: RemoteStore: Close connection if an exception occurs

Fixes #2075.
---
 src/libstore/remote-store.hh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/libstore/remote-store.hh')

diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 9d768576bad8..7f9d7d1f56d6 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -14,6 +14,7 @@ class Pid;
 struct FdSink;
 struct FdSource;
 template<typename T> class Pool;
+struct ConnectionHandle;
 
 
 /* FIXME: RemoteStore is a misnomer - should be something like
@@ -111,7 +112,7 @@ protected:
 
         virtual ~Connection();
 
-        void processStderr(Sink * sink = 0, Source * source = 0);
+        std::exception_ptr processStderr(Sink * sink = 0, Source * source = 0);
     };
 
     ref<Connection> openConnectionWrapper();
@@ -124,6 +125,10 @@ protected:
 
     virtual void setOptions(Connection & conn);
 
+    ConnectionHandle getConnection();
+
+    friend class ConnectionHandle;
+
 private:
 
     std::atomic_bool failed{false};
-- 
cgit 1.4.1