don't count health check conferences in current count or all-time cou…

…nt (#403)
jitsi · Nov 11, 2019 · a5a6894 · a5a6894
1 parent ab225c0
commit a5a6894
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/org/jitsi/jicofo/FocusManager.java b/src/main/java/org/jitsi/jicofo/FocusManager.java
@@ -469,7 +469,10 @@ private JitsiMeetConferenceImpl createConference(
         conferences.put(room, conference);
         conferenceIds.add(id);
 
-        statistics.totalConferencesCreated.incrementAndGet();
+        if (includeInStatistics)
+        {
+            statistics.totalConferencesCreated.incrementAndGet();
+        }
 
         if (conference.getLogger().isInfoEnabled())
         {
@@ -665,6 +668,13 @@ public int getConferenceCount()
         return conferences.size();
     }
 
+    public int getNonHealthCheckConferenceCount()
+    {
+        return (int)conferences.values().stream()
+            .filter(JitsiMeetConferenceImpl::includeInStatistics)
+            .count();
+    }
+
     /**
      * Returns <tt>true</tt> if graceful shutdown mode has been enabled and
      * the process is going to be finished once conference count drops to zero.

diff --git a/src/main/java/org/jitsi/jicofo/stats/JicofoStatisticsSnapshot.java b/src/main/java/org/jitsi/jicofo/stats/JicofoStatisticsSnapshot.java
@@ -48,7 +48,7 @@ public static JicofoStatisticsSnapshot generate(
             focusManager.getStatistics().totalParticipants.get();
         snapshot.totalConferencesCreated =
             focusManager.getStatistics().totalConferencesCreated.get();
-        snapshot.numConferences = focusManager.getConferenceCount();
+        snapshot.numConferences = focusManager.getNonHealthCheckConferenceCount();
         for (JitsiMeetConference conference : focusManager.getConferences())
         {
             if (!conference.includeInStatistics())