Browse Source

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

Adam Ierymenko 8 years ago
parent
commit
40078a99de
1 changed files with 2 additions and 8 deletions
  1. 2 8
      service/OneService.cpp

+ 2 - 8
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);
 					}
 				}