Make parse failure of local.conf non-fatal in case people have ancient files sitting around.

1 files changed, 2 insertions, 8 deletions

diff --git a/service/OneService.cpp b/service/OneService.cpp
index 425c8ef9..289f0cbc 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -847,16 +847,10 @@ public:
 					try {
 						_localConfig = json::parse(lcbuf);
 						if (!_localConfig.is_object()) {
-							Mutex::Lock _l(_termReason_m);
-							_termReason = ONE_UNRECOVERABLE_ERROR;
-							_fatalErrorMessage = "invalid local.conf (content is not JSON object)";
-							return _termReason;
+							fprintf(stderr,"WARNING: unable to parse local.conf (root element is not a JSON object)" ZT_EOL_S);
 						}
 					} catch ( ... ) {
-						Mutex::Lock _l(_termReason_m);
-						_termReason = ONE_UNRECOVERABLE_ERROR;
-						_fatalErrorMessage = "invalid local.conf (JSON parse error)";
-						return _termReason;
+						fprintf(stderr,"WARNING: unable to parse local.conf (invalid JSON)" ZT_EOL_S);
 					}
 				}