diff options
author | Jesús Espino <jespinog@gmail.com> | 2018-02-07 18:05:23 +0100 |
---|---|---|
committer | Jesús Espino <jespinog@gmail.com> | 2018-02-07 18:05:23 +0100 |
commit | a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e (patch) | |
tree | 985cb699d278f68522b08b60b1e7b84e0bd243fc /app/diagnostics.go | |
parent | 7941c30117efe1b957ac0458c2f0479e3824196d (diff) | |
parent | 7bd298ceaa24c0721e0acd65692cb2d1ca4983f3 (diff) | |
download | chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.tar.gz chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.tar.bz2 chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1
Diffstat (limited to 'app/diagnostics.go')
-rw-r--r-- | app/diagnostics.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index c74224f19..6d83d3a89 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -11,7 +11,6 @@ import ( "sync/atomic" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" "github.com/segmentio/analytics-go" ) @@ -502,6 +501,7 @@ func (a *App) trackConfig() { a.SendDiagnostic(TRACK_CONFIG_MESSAGE_EXPORT, map[string]interface{}{ "enable_message_export": *cfg.MessageExportSettings.EnableExport, + "export_format": *cfg.MessageExportSettings.ExportFormat, "daily_run_time": *cfg.MessageExportSettings.DailyRunTime, "default_export_from_timestamp": *cfg.MessageExportSettings.ExportFromTimestamp, "batch_size": *cfg.MessageExportSettings.BatchSize, @@ -509,17 +509,17 @@ func (a *App) trackConfig() { } func (a *App) trackLicense() { - if utils.IsLicensed() { + if license := a.License(); license != nil { data := map[string]interface{}{ - "customer_id": utils.License().Customer.Id, - "license_id": utils.License().Id, - "issued": utils.License().IssuedAt, - "start": utils.License().StartsAt, - "expire": utils.License().ExpiresAt, - "users": *utils.License().Features.Users, + "customer_id": license.Customer.Id, + "license_id": license.Id, + "issued": license.IssuedAt, + "start": license.StartsAt, + "expire": license.ExpiresAt, + "users": *license.Features.Users, } - features := utils.License().Features.ToMap() + features := license.Features.ToMap() for featureName, featureValue := range features { data["feature_"+featureName] = featureValue } |