Merge pull request #3509 from slahirucd7/subOrgImpl

Minor imprvements considering the logs relevant to the subscription rate-limiting
wso2 · May 9, 2024 · 71f1941 · 71f1941
2 parents 453e2d6 + f431486
commit 71f1941
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/adapter/internal/discovery/xds/marshaller.go b/adapter/internal/discovery/xds/marshaller.go
@@ -508,8 +508,9 @@ func MarshalSubscriptionPolicyEventAndReturnList(policy *types.SubscriptionPolic
 		SubscriptionPolicyMap[policy.ID] = subPolicy
 		if eventType == UpdateEvent {
 			logger.LoggerInternalMsg.Infof("Subscription policy: %s is updated for organization: %s", subPolicy.Name, subPolicy.Organization)
+		} else {
+			logger.LoggerInternalMsg.Infof("Subscription policy: %s is added for organization: %s", subPolicy.Name, subPolicy.Organization)
 		}
-		logger.LoggerInternalMsg.Infof("Subscription policy: %s is added for organization: %s", subPolicy.Name, subPolicy.Organization)
 	}
 	return marshalSubscriptionPolicyMapToList(SubscriptionPolicyMap)
 }

diff --git a/...nforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java b/...nforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java
@@ -345,6 +345,12 @@ public AuthenticationContext authenticate(RequestContext requestContext) throws
                             requestContext.addMetadataToMap("ratelimit:organization",
                                     APIConstants.SUPER_TENANT_DOMAIN_NAME);
                         }
+                        if (log.isDebugEnabled()) {
+                            log.debug("Organization ID: " +
+                                    requestContext.getMetadataMap().get("ratelimit:organization")
+                                    + ", SubscriptionId: " + subscriptionId + ", SubscriptionPolicy: " + subPolicyName
+                                    + " will be evaluated for subscription rate-limiting");
+                        }
                     }
                     return authenticationContext;
                 } else {