From 14b65b990c7f67b66c3188b4120bf27fb1f24a2d Mon Sep 17 00:00:00 2001 From: Martin Kraft Date: Thu, 3 May 2018 10:00:33 -0400 Subject: MM-10393: Fix for tracking active vs inactive users. (#8706) --- app/diagnostics.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'app/diagnostics.go') diff --git a/app/diagnostics.go b/app/diagnostics.go index 6237f5f83..7dcea839e 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -138,7 +138,7 @@ func (a *App) trackActivity() { activeUserCount = ucr.Data.(int64) } - if iucr := <-a.Srv.Store.Status().GetTotalActiveUsersCount(); iucr.Err == nil { + if iucr := <-a.Srv.Store.User().AnalyticsGetInactiveUsersCount(); iucr.Err == nil { inactiveUserCount = iucr.Data.(int64) } @@ -171,17 +171,17 @@ func (a *App) trackActivity() { } a.SendDiagnostic(TRACK_ACTIVITY, map[string]interface{}{ - "registered_users": userCount, - "active_users": activeUserCount, - "registered_inactive_users": inactiveUserCount, - "teams": teamCount, - "public_channels": publicChannelCount, - "private_channels": privateChannelCount, - "direct_message_channels": directChannelCount, - "public_channels_deleted": deletedPublicChannelCount, - "private_channels_deleted": deletedPrivateChannelCount, - "posts": postsCount, - "used_apiv3": atomic.LoadInt32(model.UsedApiV3) == 1, + "registered_users": userCount, + "active_users": activeUserCount, + "registered_deactivated_users": inactiveUserCount, + "teams": teamCount, + "public_channels": publicChannelCount, + "private_channels": privateChannelCount, + "direct_message_channels": directChannelCount, + "public_channels_deleted": deletedPublicChannelCount, + "private_channels_deleted": deletedPrivateChannelCount, + "posts": postsCount, + "used_apiv3": atomic.LoadInt32(model.UsedApiV3) == 1, }) atomic.StoreInt32(model.UsedApiV3, 0) -- cgit v1.2.3-1-g7c22