Better logging when local state can't be loaded

ChangeLog.txt

@@ -1,5 +1,7 @@
 Version 0.10.2 (unreleased)
 ---------------
+Improvements:
+* Better logging when local state can't be loaded
 
 
 Version 0.10.1

src/cryfs/config/CryConfig.cpp

@@ -40,6 +40,7 @@ CryConfig::CryConfig()
 CryConfig CryConfig::load(const Data &data) {
   stringstream stream;
   data.StoreToStream(stream);
+
   ptree pt;
   read_json(stream, pt);
 

src/cryfs/localstate/BasedirMetadata.cpp

@@ -4,6 +4,7 @@
 #include <vendor_cryptopp/sha.h>
 #include <boost/filesystem/operations.hpp>
 #include "LocalStateDir.h"
+#include <cpp-utils/logging/logging.h>
 
 namespace bf = boost::filesystem;
 using boost::property_tree::ptree;
@@ -15,12 +16,14 @@ using std::istream;
 using std::ifstream;
 using std::ofstream;
 using std::string;
+using namespace cpputils::logging;
 
 namespace cryfs {
 
 namespace {
 
 ptree _load(const bf::path &metadataFilePath) {
+	try {
 		ptree result;
 
 		ifstream file(metadataFilePath.string());
@@ -29,6 +32,11 @@ ptree _load(const bf::path &metadataFilePath) {
 		}
 
 		return result;
+	}
+	catch (...) {
+		LOG(ERR, "Error loading BasedirMetadata");
+		throw;
+	}
 }
 
 void _save(const bf::path &metadataFilePath, const ptree& data) {

src/cryfs/localstate/LocalStateMetadata.cpp

@@ -21,6 +21,7 @@ using cpputils::hash::Hash;
 using cpputils::Data;
 using cpputils::Random;
 namespace bf = boost::filesystem;
+using namespace cpputils::logging;
 
 namespace cryfs {
 
@@ -106,6 +107,7 @@ void LocalStateMetadata::_serialize(ostream& stream) const {
 }
 
 LocalStateMetadata LocalStateMetadata::_deserialize(istream& stream) {
+	try {
 		ptree pt;
 		read_json(stream, pt);
 
@@ -117,6 +119,11 @@ LocalStateMetadata LocalStateMetadata::_deserialize(istream& stream) {
 			/*.digest = */ cpputils::hash::Digest::FromString(encryptionKeyDigest),
 			/*.salt = */ cpputils::hash::Salt::FromString(encryptionKeySalt)
 			});
+	}
+	catch (...) {
+		LOG(ERR, "Error loading LocalStateMetadata");
+		throw;
+	}
 }
 
 }