Made startup timer explicitly linked to broadcast interval, fixed for…

…ced quota renewal bug

api.go

@@ -116,6 +116,9 @@ func doAddOrUpdate(keyName string, newSession SessionState, dontReset bool) erro
 							QuotaHandler.TagDelete(keyName)
 						}
 						apiSpec.SessionManager.ResetQuota(keyName, newSession)
+
+						// Update the maximum
+						newSession.QuotaRemaining = newSession.QuotaMax
 						newSession.QuotaRenews = time.Now().Unix() + newSession.QuotaRenewalRate
 					}
 

auth_manager.go

@@ -102,6 +102,9 @@ func (b *DefaultSessionManager) ResetQuota(keyName string, session SessionState)
 	// Fix the raw key
 	go b.Store.DeleteRawKey(rawKey)
 	//go b.Store.SetKey(rawKey, "0", session.QuotaRenewalRate)
+	if config.UseDistributedQuotaCounter {
+		QuotaHandler.TagDelete(keyName)
+	}
 }
 
 // UpdateSession updates the session state in the storage engine

dq.go

@@ -144,7 +144,8 @@ func startDQ(statusFunc GetLeaderStatusFunc) {
 	}
 
 	QuotaHandler = dq.NewDQ(dqFlusher, dqErrorHandler, NodeID)
-	QuotaHandler.BroadcastWith(c1, time.Millisecond*100, getDQTopic())
+	broadcastTimer := time.Millisecond*100
+	QuotaHandler.BroadcastWith(c1, broadcastTimer, getDQTopic())
 
 	// We always need a leader because otherwise we can;t persist data
 	QuotaHandler.SetLeader(statusFunc())
@@ -160,8 +161,8 @@ func startDQ(statusFunc GetLeaderStatusFunc) {
 		log.Fatal(err)
 	}
 
-	// Give us time to catch up
-	time.Sleep(time.Millisecond * 100)
+	// Give us time to catch with the cluster
+	time.Sleep(broadcastTimer)
 }
 
 func (l SessionLimiter) IsDistributedQuotaExceeded(currentSession *SessionState, key string) bool {