summaryrefslogtreecommitdiffstats
path: root/app/diagnostics.go
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-09 15:00:07 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-09 15:00:07 -0400
commitd3e14a1bf86ac6148e09f888384cb46c61f23cdc (patch)
tree1c634c90166964f5184cb1ebd20ffb8ed209b120 /app/diagnostics.go
parent60cf74352f13874a7d07c609c03b1c763af19cea (diff)
parentc1853c7f40dd67c49524c8ea884ab61883a6abdd (diff)
downloadchat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.tar.gz
chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.tar.bz2
chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.zip
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'app/diagnostics.go')
-rw-r--r--app/diagnostics.go24
1 files changed, 12 insertions, 12 deletions
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)