Merge pull request #449 from jitsi/logs_to_callstats

Fix errors with sending final logs batch to CallStats

modules/statistics/CallStats.js

             logger.warn('No error is passed!');
             _error = new Error('Unknown error');
         }
-        if (CallStats.initialized) {
-            CallStats.backend.reportError(pc, cs && cs.confID, type, _error);
+        if (CallStats.initialized && cs) {
+            CallStats.backend.reportError(pc, cs.confID, type, _error);
         } else {
             CallStats.reportsQueue.push({
                 type: reportType.ERROR,
         const pc = cs && cs.peerconnection;
         const confID = cs && cs.confID;
 
-        if (CallStats.initialized) {
+        if (CallStats.initialized && cs) {
             CallStats.backend.sendFabricEvent(pc, event, confID, eventData);
         } else {
             CallStats.reportsQueue.push({
                 CallStats.backend.fabricEvent.fabricTerminated,
                 this.confID);
         }
+        CallStats.fabrics.delete(this);
     }
 
     /**

modules/statistics/statistics.js

 
 Statistics.prototype.dispose = function() {
     try {
-        if (this.eventEmitter) {
+        // NOTE Before reading this please see the comment in stopCallStats...
+        //
+        // Here we prevent from emitting the event twice in case it will be
+        // triggered from stopCallStats.
+        // If the event is triggered from here it means that the logs will not
+        // be submitted anyway (because there is no CallStats instance), but
+        // we're doing that for the sake of some kind of consistency.
+        if (!this.callsStatsInstances.size) {
             this.eventEmitter.emit(StatisticsEvents.BEFORE_DISPOSED);
         }
         for (const callStats of this.callsStatsInstances.values()) {
     const callStatsInstance = this.callsStatsInstances.get(tpc.id);
 
     if (callStatsInstance) {
+        // FIXME the original purpose of adding BEFORE_DISPOSED event was to be
+        // able to submit the last log batch from jitsi-meet to CallStats. After
+        // recent changes we dispose the CallStats earlier
+        // (before Statistics.dispose), so we need to emit this event here to
+        // give this last chance for final log batch submission.
+        //
+        // Eventually there should be a separate module called "log storage"
+        // which should emit proper events when it's underlying
+        // CallStats instance is going away.
+        if (this.callsStatsInstances.size === 1) {
+            this.eventEmitter.emit(StatisticsEvents.BEFORE_DISPOSED);
+        }
         this.callsStatsInstances.delete(tpc.id);
 
         // The fabric needs to be terminated when being stopped