embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

conflict in en.json

This commit is contained in:
Jonathan Rainville 2018-05-28 11:52:49 -04:00
parent 0f07a00791
commit 2b54dfd7cc
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/i18n/locales/en.json
View File

@ -137,6 +137,7 @@
"error uploading to swarm": "error uploading to swarm", "error uploading to swarm": "error uploading to swarm",
"Starting ipfs process": "Starting ipfs process", "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", "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: ", "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.", "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...", "Installing packages...": "Installing packages...",

2
lib/processes/storageProcesses/storageProcessesLauncher.js
View File

@ -30,7 +30,7 @@ class StorageProcessesLauncher {
modulePath: filePath, modulePath: filePath,
logger: self.logger, logger: self.logger,
events: self.events, events: self.events,
silent: false, silent: true,
exitCallback: self.processExited.bind(this, storageName) exitCallback: self.processExited.bind(this, storageName)
}); });
self.processes[storageName].send({action: constants.blockchain.init, options: {storageConfig: self.storageConfig}}); self.processes[storageName].send({action: constants.blockchain.init, options: {storageConfig: self.storageConfig}});

4
lib/processes/storageProcesses/swarm.js
View File

@ -11,7 +11,7 @@ class SwarmProcess extends ProcessWrapper {
} }
startSwarmDaemon() { startSwarmDaemon() {
console.log(this.storageConfig); const self = this;
if (!this.storageConfig.account || !this.storageConfig.account.address || !this.storageConfig.account.password) { 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'; 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(); process.exit();
}); });
let lastMessage; let lastMessage;
child.stdout.on('data', (data) => { child.stderr.on('data', (data) => {
if (!self.readyCalled && data.indexOf('Swarm http proxy started') > -1) { if (!self.readyCalled && data.indexOf('Swarm http proxy started') > -1) {
self.readyCalled = true; self.readyCalled = true;
self.send({result: constants.storage.initiated}); self.send({result: constants.storage.initiated});