From 2b54dfd7ccfda311330ef9d96eab6d156567657b Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Mon, 28 May 2018 11:52:49 -0400 Subject: [PATCH] conflict in en.json --- lib/i18n/locales/en.json | 1 + lib/processes/storageProcesses/storageProcessesLauncher.js | 2 +- lib/processes/storageProcesses/swarm.js | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/i18n/locales/en.json b/lib/i18n/locales/en.json index b97a51445..9562751d2 100644 --- a/lib/i18n/locales/en.json +++ b/lib/i18n/locales/en.json @@ -137,6 +137,7 @@ "error uploading to swarm": "error uploading to swarm", "Starting ipfs process": "Starting ipfs process", "Storage process for ipfs ended before the end of this process. Code: 0": "Storage process for ipfs ended before the end of this process. Code: 0", + "successfully uploaded to swarm": "successfully uploaded to swarm", "WARNING! DApp path length is too long: ": "WARNING! DApp path length is too long: ", "This is known to cause issues with starting geth, please consider reducing your DApp path's length to 66 characters or less.": "This is known to cause issues with starting geth, please consider reducing your DApp path's length to 66 characters or less.", "Installing packages...": "Installing packages...", diff --git a/lib/processes/storageProcesses/storageProcessesLauncher.js b/lib/processes/storageProcesses/storageProcessesLauncher.js index 005c8fe59..f5e2fc0a1 100644 --- a/lib/processes/storageProcesses/storageProcessesLauncher.js +++ b/lib/processes/storageProcesses/storageProcessesLauncher.js @@ -30,7 +30,7 @@ class StorageProcessesLauncher { modulePath: filePath, logger: self.logger, events: self.events, - silent: false, + silent: true, exitCallback: self.processExited.bind(this, storageName) }); self.processes[storageName].send({action: constants.blockchain.init, options: {storageConfig: self.storageConfig}}); diff --git a/lib/processes/storageProcesses/swarm.js b/lib/processes/storageProcesses/swarm.js index 78e210e70..05db51f82 100644 --- a/lib/processes/storageProcesses/swarm.js +++ b/lib/processes/storageProcesses/swarm.js @@ -11,7 +11,7 @@ class SwarmProcess extends ProcessWrapper { } startSwarmDaemon() { - console.log(this.storageConfig); + const self = this; if (!this.storageConfig.account || !this.storageConfig.account.address || !this.storageConfig.account.password) { return 'Account address and password are needed in the storage config to start the Swarm process'; } @@ -26,7 +26,7 @@ class SwarmProcess extends ProcessWrapper { process.exit(); }); let lastMessage; - child.stdout.on('data', (data) => { + child.stderr.on('data', (data) => { if (!self.readyCalled && data.indexOf('Swarm http proxy started') > -1) { self.readyCalled = true; self.send({result: constants.storage.initiated});