CR fixes

superstreamlabs · Sep 27, 2023 · a1bedc1 · a1bedc1
1 parent 40f9c52
commit a1bedc1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/server/background_tasks.go b/server/background_tasks.go
@@ -38,7 +38,6 @@ const SCHEMAVERSE_DLS_INNER_SUBJ = "$memphis_schemaverse_inner_dls"
 const SCHEMAVERSE_DLS_CONSUMER = "$memphis_schemaverse_dls_consumer"
 const CACHE_UDATES_SUBJ = "$memphis_cache_updates"
 const INTEGRATIONS_AUDIT_LOGS_CONSUMER = "$memphis_integrations_audit_logs_consumer"
-const INTEGRATIONS_AUDIT_LOGS_SUBJ = "$memphis_integrations_audit_logs"
 
 var LastReadThroughputMap map[string]models.Throughput
 var LastWriteThroughputMap map[string]models.Throughput

diff --git a/server/jetstream.go b/server/jetstream.go
@@ -1335,8 +1335,6 @@ func (a *Account) EnableJetStream(limits map[string]JetStreamAccountLimits) erro
 			DLS_UNACKED_CONSUMER_CREATED = true
 		case dlsSchemaverseStream:
 			DLS_SCHEMAVERSE_CONSUMER_CREATED = true
-		// case integrationsAuditLogsStream:
-		// 	INTEGRATIONS_AUDIT_LOGS_CONSUMER_CREATED = true
 		}
 		// added by Memphis ***
 

diff --git a/server/memphis_handlers_integrations.go b/server/memphis_handlers_integrations.go
@@ -507,7 +507,7 @@ func (s *Server) getIntegrationAuditLogs(integrationType, tenantName string) ([]
 	const timeout = 500 * time.Millisecond
 	uid := s.memphis.nuid.Next()
 	msgs := []StoredMsg{}
-	durableName := "$memphis_integrations_audit_logs_consumer_" + uid
+	durableName := INTEGRATIONS_AUDIT_LOGS_CONSUMER + "_" + uid
 	cc := ConsumerConfig{
 		DeliverPolicy: DeliverAll,
 		AckPolicy:     AckExplicit,
@@ -615,7 +615,7 @@ func (s *Server) purgeIntegrationAuditLogs(integrationType, tenantName string) {
 		return
 	}
 
-	requestSubject := fmt.Sprintf(JSApiMsgDeleteT, INTEGRATIONS_AUDIT_LOGS_SUBJ)
+	requestSubject := fmt.Sprintf(JSApiMsgDeleteT, integrationsAuditLogsStream)
 	for _, log := range auditLogs {
 		var resp JSApiMsgDeleteResponse
 		req := JSApiMsgDeleteRequest{Seq: log.ID}