From 9fa8bbdb38c934569433b0836c73e36f5b254de7 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 12 Aug 2015 01:49:26 +0100
Subject: Improve error handling around ICE exceptions

---
 netfs/fuse/fuseApp.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/netfs/fuse/fuseApp.cpp b/netfs/fuse/fuseApp.cpp
index 133860a..bc5caf0 100644
--- a/netfs/fuse/fuseApp.cpp
+++ b/netfs/fuse/fuseApp.cpp
@@ -180,7 +180,8 @@ NetFS::FuseApp::verifyConnection()
 int
 NetFS::FuseApp::onError(const std::exception & e) throw()
 {
-	if (dynamic_cast<const Ice::ObjectNotExistException *>(&e)) {
+	if (dynamic_cast<const Ice::SocketException *>(&e) || dynamic_cast<const Ice::TimeoutException *>(&e)) {
+		log(LOG_ERR, e.what());
 		verifyConnection();
 		connectSession();
 		connectToService();
@@ -188,6 +189,12 @@ NetFS::FuseApp::onError(const std::exception & e) throw()
 		connectHandles();
 		return 0;
 	}
+	if (dynamic_cast<const Ice::RequestFailedException *>(&e)) {
+		volume = NULL;
+		connectToVolume();
+		connectHandles();
+		return 0;
+	}
 	if (dynamic_cast<const NetFS::AuthError *>(&e)) {
 		return -EPERM;
 	}
-- 
cgit v1.2.3