Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-17206] Fixed bug where the CLI would wait for analytics to send. #145

Merged
merged 1 commit into from
Jun 25, 2014
Merged

[TIMOB-17206] Fixed bug where the CLI would wait for analytics to send. #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* Fixed 'setup check' command when fetching available Node.js and NPM releases [TIMOB-16996]
* Fixed bug with boolean config setting values being saved as integers [TIMOB-17087]
* Moved the sending of analytics from the 'exit' event to the command finished callback [TIMOB-17046]
* Fixed bug where the CLI would wait for analytics to send [TIMOB-17206]

3.2.3 (5/1/2014)
-------------------
Expand Down
38 changes: 16 additions & 22 deletions lib/titanium.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,28 +414,22 @@ function run(locale) {
cli.go(function () {
if (cli.command && cli.command.conf && !cli.command.conf.skipSendingAnalytics) {
// send the analytics
appc.analytics.send(
appc.util.mix(
{
appId: pkginfo.about.id,
appName: pkginfo.about.name,
appGuid: 'cf5c67ed-1c3b-494b-afe0-01b958ef0f40',
titaniumHomeDir: path.join('~', '.titanium'),
version: pkginfo.version,
deployType: 'production',
httpProxyServer: config.cli.httpProxyServer,
rejectUnauthorized: config.get('cli.rejectUnauthorized', true),
analyticsUrl: config.get('cli.analytics.url'),
logger: logger,
debug: config.get('cli.analytics.debug', false)
},
appc.auth.status() // loggedIn, uid, guid, email, cookie
),
function () {
// exit now since we don't want to wait for the analytics to be sent
process.exit(0);
}
);
appc.analytics.send(appc.util.mix(
{
appId: pkginfo.about.id,
appName: pkginfo.about.name,
appGuid: 'cf5c67ed-1c3b-494b-afe0-01b958ef0f40',
titaniumHomeDir: path.join('~', '.titanium'),
version: pkginfo.version,
deployType: 'production',
httpProxyServer: config.cli.httpProxyServer,
rejectUnauthorized: config.get('cli.rejectUnauthorized', true),
analyticsUrl: config.get('cli.analytics.url'),
logger: logger,
debug: config.get('cli.analytics.debug', false)
},
appc.auth.status() // loggedIn, uid, guid, email, cookie
));
}
});
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"jade": "~0.35.0",
"longjohn": "~0.2.2",
"moment": "~2.4.0",
"node-appc": "0.2.13",
"node-appc": "0.2.14",
"optimist": "~0.6.0",
"request": "~2.27.0",
"semver": "~2.2.1",
Expand Down