Logs message changed from info to debug
This commit is contained in:
parent
784896bda0
commit
7689b2238e
|
@ -15,7 +15,7 @@ public abstract class AbstractOIDCToSitesAndRolesMapper implements OIDCToSitesAn
|
||||||
public AbstractOIDCToSitesAndRolesMapper(Map<String, List<String>> resourceName2AccessRoles) {
|
public AbstractOIDCToSitesAndRolesMapper(Map<String, List<String>> resourceName2AccessRoles) {
|
||||||
super();
|
super();
|
||||||
this.resourceName2AccessRoles = resourceName2AccessRoles;
|
this.resourceName2AccessRoles = resourceName2AccessRoles;
|
||||||
logger.info("Resource name to access roles: {}", resourceName2AccessRoles);
|
logger.debug("Resource name to access roles: {}", resourceName2AccessRoles);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -33,7 +33,7 @@ public class SlashSeparatedContextMapper extends AbstractOIDCToSitesAndRolesMapp
|
||||||
// Sorting sites, the containers site should come before contained one
|
// Sorting sites, the containers site should come before contained one
|
||||||
Site gwSitesTree = null;
|
Site gwSitesTree = null;
|
||||||
for (String site : sites) {
|
for (String site : sites) {
|
||||||
logger.info("Checking site: " + site);
|
logger.debug("Checking site: " + site);
|
||||||
List<String> roles = resourceName2AccessRoles.get(site);
|
List<String> roles = resourceName2AccessRoles.get(site);
|
||||||
logger.debug("Roles for site are: {}", roles);
|
logger.debug("Roles for site are: {}", roles);
|
||||||
String[] siteTokens = site.split(SPLIT_REGEXP);
|
String[] siteTokens = site.split(SPLIT_REGEXP);
|
||||||
|
@ -45,10 +45,10 @@ public class SlashSeparatedContextMapper extends AbstractOIDCToSitesAndRolesMapp
|
||||||
String rootVO = siteTokens[ROOT_VO_TOKEN_INDEX];
|
String rootVO = siteTokens[ROOT_VO_TOKEN_INDEX];
|
||||||
logger.debug("Root VO is: {}", rootVO);
|
logger.debug("Root VO is: {}", rootVO);
|
||||||
if (!rootSite.equals(rootVO)) {
|
if (!rootSite.equals(rootVO)) {
|
||||||
logger.info("Skipping evaluation of site tree not belonging to this Root VO: {}", rootVO);
|
logger.debug("Skipping evaluation of site tree not belonging to this Root VO: {}", rootVO);
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
logger.info("Site belongs to this Root VO");
|
logger.debug("Site belongs to this Root VO");
|
||||||
}
|
}
|
||||||
if (siteTokens.length >= VO_TOKEN_INDEX + 1) {
|
if (siteTokens.length >= VO_TOKEN_INDEX + 1) {
|
||||||
if (gwSitesTree == null) {
|
if (gwSitesTree == null) {
|
||||||
|
@ -64,19 +64,19 @@ public class SlashSeparatedContextMapper extends AbstractOIDCToSitesAndRolesMapp
|
||||||
}
|
}
|
||||||
String vre = siteTokens[VRE_TOKEN_INDEX];
|
String vre = siteTokens[VRE_TOKEN_INDEX];
|
||||||
logger.debug("VRE is: {}", vre);
|
logger.debug("VRE is: {}", vre);
|
||||||
logger.info("Adding leaf site: {}", vre);
|
logger.debug("Adding leaf site: {}", vre);
|
||||||
gwSitesTree.getChildren().get(vo).getChildren().put(vre, new Site(vre, roles));
|
gwSitesTree.getChildren().get(vo).getChildren().put(vre, new Site(vre, roles));
|
||||||
} else if (!gwSitesTree.getChildren().containsKey(vo)) {
|
} else if (!gwSitesTree.getChildren().containsKey(vo)) {
|
||||||
logger.info("Creating site for VO: {}", vo);
|
logger.debug("Creating site for VO: {}", vo);
|
||||||
gwSitesTree.getChildren().put(vo, new Site(vo, roles));
|
gwSitesTree.getChildren().put(vo, new Site(vo, roles));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (gwSitesTree == null) {
|
if (gwSitesTree == null) {
|
||||||
logger.info("Creating site for Root VO: {}", rootVO);
|
logger.debug("Creating site for Root VO: {}", rootVO);
|
||||||
gwSitesTree = new Site(rootVO, roles);
|
gwSitesTree = new Site(rootVO, roles);
|
||||||
} else {
|
} else {
|
||||||
if (gwSitesTree.getRoles() == null) {
|
if (gwSitesTree.getRoles() == null) {
|
||||||
logger.info("Setting out of order roles for Root VO");
|
logger.debug("Setting out of order roles for Root VO");
|
||||||
} else {
|
} else {
|
||||||
logger.warn("Duplicated roles definition for Root VO");
|
logger.warn("Duplicated roles definition for Root VO");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue