From: Carl Hetherington <cth@carlh.net>
Date: Tue, 12 Jul 2016 22:32:13 +0000 (+0100)
Subject: Stop silently catching exceptions when config load fails.
X-Git-Tag: v2.9.2~1
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=cf2146fef7540dc5349d7ac3672da0d3bfa971c0

Stop silently catching exceptions when config load fails.

I'm not sure why this was added, but it could hide serious
problems during config load: especially failures to load/create
_signer_chain which has been seen in the wild several times.
---

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 91966eefb..c483734f8 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -145,12 +145,10 @@ void
 Config::read ()
 {
 	if (!have_existing ("config.xml")) {
-		cout << "No existing config.xml; creating chains.\n";
 		/* Make a new set of signing certificates and key */
 		_signer_chain = create_certificate_chain ();
 		/* And similar for decryption of KDMs */
 		_decryption_chain = create_certificate_chain ();
-		cout << "Writing config.\n";
 		write ();
 		return;
 	}
@@ -337,16 +335,7 @@ Config::instance ()
 {
 	if (_instance == 0) {
 		_instance = new Config;
-		try {
-			_instance->read ();
-		} catch (exception& e) {
-			/* configuration load failed; never mind, just
-			   stick with the default.
-			*/
-			cerr << "dcpomatic: warning: configuration did not load (" << e.what() << "); using defaults\n";
-		} catch (...) {
-			cerr << "dcpomatic: warning: configuration did not load; using defaults\n";
-		}
+		_instance->read ();
 	}
 
 	return _instance;