ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-01-30 16:13:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure analytics failures (e.g. from broken tokens) at startup don't break commands

Browse Source 
Change-Type: patch
This commit is contained in:
Tim Perry 2017-10-05 12:49:06 +02:00
parent 39ac28d4ef
commit eb729d149e
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/app.js
View File

@ -230,15 +230,17 @@ capitano.command(actions.deploy);
update.notify(); update.notify();
plugins.register(/^resin-plugin-(.+)$/).then(function() { plugins.register(/^resin-plugin-(.+)$/).then(function() {
var cli; var cli, runCommand;
cli = capitano.parse(process.argv); cli = capitano.parse(process.argv);
return events.trackCommand(cli).then(function() { runCommand = function() {
var ref, ref1; var ref, ref1;
if ((ref = cli.global) != null ? ref.help : void 0) { if ((ref = cli.global) != null ? ref.help : void 0) {
return capitanoExecuteAsync({ return capitanoExecuteAsync({
command: "help " + ((ref1 = cli.command) != null ? ref1 : '') command: "help " + ((ref1 = cli.command) != null ? ref1 : '')
}); });
} else {
return capitanoExecuteAsync(cli);
} }
return capitanoExecuteAsync(cli); };
}); return Promise.all([events.trackCommand(cli), runCommand()]);
})["catch"](errors.handle); })["catch"](errors.handle);

4
build/events.js
View File

@ -22,7 +22,7 @@ exports.trackCommand = function(capitanoCommand) {
capitanoStateGetMatchCommandAsync = Promise.promisify(require('capitano').state.getMatchCommand); capitanoStateGetMatchCommandAsync = Promise.promisify(require('capitano').state.getMatchCommand);
return Promise.props({ return Promise.props({
resinUrl: resin.settings.get('resinUrl'), resinUrl: resin.settings.get('resinUrl'),
username: resin.auth.whoami(), username: resin.auth.whoami().catchReturn(void 0),
mixpanel: exports.getLoggerInstance() mixpanel: exports.getLoggerInstance()
}).then(function(arg) { }).then(function(arg) {
var mixpanel, resinUrl, username; var mixpanel, resinUrl, username;
@ -45,5 +45,5 @@ exports.trackCommand = function(capitanoCommand) {
command: capitanoCommand command: capitanoCommand
}); });
}); });
}); }).timeout(100).catchReturn();
}; };

9
lib/app.coffee
View File

@ -203,9 +203,12 @@ update.notify()
plugins.register(/^resin-plugin-(.+)$/).then -> plugins.register(/^resin-plugin-(.+)$/).then ->
cli = capitano.parse(process.argv) cli = capitano.parse(process.argv)
events.trackCommand(cli).then -> runCommand = ->
if cli.global?.help if cli.global?.help
return capitanoExecuteAsync(command: "help #{cli.command ? ''}") capitanoExecuteAsync(command: "help #{cli.command ? ''}")
capitanoExecuteAsync(cli) else
capitanoExecuteAsync(cli)
Promise.all([events.trackCommand(cli), runCommand()])
.catch(errors.handle) .catch(errors.handle)

4
lib/events.coffee
View File

@ -13,7 +13,7 @@ exports.trackCommand = (capitanoCommand) ->
return Promise.props return Promise.props
resinUrl: resin.settings.get('resinUrl') resinUrl: resin.settings.get('resinUrl')
username: resin.auth.whoami() username: resin.auth.whoami().catchReturn(undefined)
mixpanel: exports.getLoggerInstance() mixpanel: exports.getLoggerInstance()
.then ({ username, resinUrl, mixpanel }) -> .then ({ username, resinUrl, mixpanel }) ->
return capitanoStateGetMatchCommandAsync(capitanoCommand.command).then (command) -> return capitanoStateGetMatchCommandAsync(capitanoCommand.command).then (command) ->
@ -30,3 +30,5 @@ exports.trackCommand = (capitanoCommand) ->
resinUrl: resinUrl resinUrl: resinUrl
platform: process.platform platform: process.platform
command: capitanoCommand command: capitanoCommand
.timeout(100)
.catchReturn()