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

Merge pull request #458 from embark-framework/bug_fix/change-warn-path-depth-to-length 

Changed path depth warning to path length
This commit is contained in:
Iuri Matias 2018-05-27 08:07:25 -04:00 committed by GitHub
parent 605a3fe8d5 2608eed19b
commit 55aa1f8f0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/cmds/blockchain/blockchain.js
View File

@ -106,9 +106,10 @@ Blockchain.prototype.run = function() {
} }
const child = self.runCommand(cmd, {}, (err, stdout, _stderr) => { const child = self.runCommand(cmd, {}, (err, stdout, _stderr) => {
if (err && self.env === 'development' && stdout.indexOf('Failed to unlock') > 0) { if (err && self.env === 'development' && stdout.indexOf('Failed to unlock') > 0) {
console.warn('\n' + __('Development blockchain has changed to use the --dev option.').yellow); // console.error is captured and sent to the console output regardless of silent setting
console.warn(__('You can reset your workspace to fix the problem with').yellow + ' embark reset'.cyan); console.error('\n' + __('Development blockchain has changed to use the --dev option.').yellow);
console.warn(__('Otherwise, you can change your data directory in blockchain.json (datadir)').yellow); console.error(__('You can reset your workspace to fix the problem with').yellow + ' embark reset'.cyan);
console.error(__('Otherwise, you can change your data directory in blockchain.json (datadir)').yellow);
} }
}); });
if (self.onReadyCallback) { if (self.onReadyCallback) {
@ -134,10 +135,12 @@ Blockchain.prototype.run = function() {
Blockchain.prototype.checkPathLength = function() { Blockchain.prototype.checkPathLength = function() {
let dappPath = fs.dappPath(''); let dappPath = fs.dappPath('');
if (dappPath.split('/').length > 5) { if (dappPath.length > 66) {
console.log("===============================================================================".yellow); // console.error is captured and sent to the console output regardless of silent setting
console.log("===========> Path depth is too long ".yellow + dappPath); console.error("===============================================================================".yellow);
console.log("===========> This is known to cause issues with some applications, please consider putting your dapp in a different path".yellow); console.error("===========> ".yellow + __('WARNING! DApp path length is too long: ').yellow + dappPath.yellow);
console.error("===========> ".yellow + __('This is known to cause issues with starting geth, please consider reducing your DApp path\'s length to 66 characters or less.').yellow);
console.error("===============================================================================".yellow);
} }
}; };

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

@ -128,6 +128,11 @@
"Error while downloading the file": "Error while downloading the file", "Error while downloading the file": "Error while downloading the file",
"Error while loading the content of ": "Error while loading the content of ", "Error while loading the content of ": "Error while loading the content of ",
"no contracts found": "no contracts found", "no contracts found": "no contracts found",
"DApp path length is too long: \"": "DApp path length is too long: \"",
"This is known to cause issues with some applications, please consider reducing your DApp path's length to 66 characters or less.": "This is known to cause issues with some applications, please consider reducing your DApp path's length to 66 characters or less.",
"DApp path length is too long: ": "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.",
"Installing packages...": "Installing packages...", "Installing packages...": "Installing packages...",
"Next steps:": "Next steps:", "Next steps:": "Next steps:",
"open another console in the same directory and run": "open another console in the same directory and run", "open another console in the same directory and run": "open another console in the same directory and run",

2
lib/processes/blockchainProcessLauncher.js
View File

@ -25,7 +25,7 @@ class BlockchainProcessLauncher {
logger: this.logger, logger: this.logger,
events: this.events, events: this.events,
normalizeInput: this.normalizeInput, normalizeInput: this.normalizeInput,
silent: true, silent: this.logger.logLevel !== 'trace',
exitCallback: this.processEnded.bind(this) exitCallback: this.processEnded.bind(this)
}); });
this.blockchainProcess.send({ this.blockchainProcess.send({