[fix #2925] Fix messed-up merge in b87a52e2d

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
Pedro Pombeiro 2018-01-08 14:39:29 +01:00
parent 9631552251
commit 1c5cf7fe4b
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
2 changed files with 2 additions and 2 deletions

View File

@ -229,7 +229,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
Log.d(TAG, "StartNode result: " + res);
}
else {
Log.e(TAG, "StartNode result: " + res);
Log.e(TAG, "StartNode failed: " + res);
}
Log.d(TAG, "Geth node started");
status.sendMessage();

View File

@ -203,7 +203,7 @@ RCT_EXPORT_METHOD(startNode:(NSString *)configString) {
[resultingConfigJson setValue:newKeystoreUrl.path forKey:@"KeyStoreDir"];
[resultingConfigJson setValue:[NSNumber numberWithBool:[logLevel length] != 0] forKey:@"LogEnabled"];
[resultingConfigJson setValue:logUrl.path forKey:@"LogFile"];
[resultingConfigJson setValue:([logLevel length] == 0 ? "ERROR" : logLevel) forKey:@"LogLevel"];
[resultingConfigJson setValue:([logLevel length] == 0 ? [NSString stringWithUTF8String: "ERROR"] : logLevel) forKey:@"LogLevel"];
if(upstreamURL != nil) {
[resultingConfigJson setValue:[NSNumber numberWithBool:YES] forKeyPath:@"UpstreamConfig.Enabled"];