gCubeSystem
/
ws-task-executor-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed logs 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/widgets/ws-task-executor-widget@181660 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2019-09-13 13:18:30 +00:00
parent 0ef0723f69
commit 038f9bf5ee
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/gcube/portlets/widgets/wstaskexecutor/server/WsTaskExecutorWidgetServiceImpl.java
View File

@ -54,6 +54,8 @@ public class WsTaskExecutorWidgetServiceImpl extends RemoteServiceServlet implem
WsTaskExecutorWidgetService { WsTaskExecutorWidgetService {
private static Logger logger = LoggerFactory.getLogger(WsTaskExecutorWidgetServiceImpl.class); private static Logger logger = LoggerFactory.getLogger(WsTaskExecutorWidgetServiceImpl.class);
public static final String DM_RESOURCE_NAME = "DataMiner";
public static final String DM_RESOURCE_CATEGORY = "DataAnalysis";
/** /**
* Checks if is within portal. * Checks if is within portal.
@ -101,9 +103,9 @@ public class WsTaskExecutorWidgetServiceImpl extends RemoteServiceServlet implem
GCubeUser user = PortalContextUtil.getUserLogged(this.getThreadLocalRequest()); GCubeUser user = PortalContextUtil.getUserLogged(this.getThreadLocalRequest());
String scope = PortalContextUtil.getCurrentScope(this.getThreadLocalRequest()); String scope = PortalContextUtil.getCurrentScope(this.getThreadLocalRequest());
logger.debug("Found user "+user+ ", scope: "+scope+" into PortalContext, using them..."); logger.debug("Into PortalContext I Found the user "+user.getUsername()+ "by using the scope: "+scope+" , using it...");
ScopeProvider.instance.set(scope); ScopeProvider.instance.set(scope);
logger.info("Using user "+user.getUsername()+ "and scope: "+scope+" to intancing the "+WorkspaceDataMinerTaskExecutor.class.getSimpleName()); logger.info("Using user "+user.getUsername()+ "and scope: "+scope+" for intancing the "+WorkspaceDataMinerTaskExecutor.class.getSimpleName());
WorkspaceDataMinerTaskExecutor exec = WorkspaceDataMinerTaskExecutor.getInstance(); WorkspaceDataMinerTaskExecutor exec = WorkspaceDataMinerTaskExecutor.getInstance();
//exec.withOwner(user.getUsername()); //exec.withOwner(user.getUsername());
return exec; return exec;
@ -135,9 +137,9 @@ public class WsTaskExecutorWidgetServiceImpl extends RemoteServiceServlet implem
//FILTERING THE VREs FOR GATEWAY //FILTERING THE VREs FOR GATEWAY
long theGroupId = PortalContext.getConfiguration().getCurrentGroupId(this.getThreadLocalRequest()); long theGroupId = PortalContext.getConfiguration().getCurrentGroupId(this.getThreadLocalRequest());
logger.info("Searching for userId {} and grouId {}", userId, theGroupId); logger.info("Searching registered VREs for userId {} and grouId {}", userId, theGroupId);
Set<GCubeGroup> listOfGroups = groupManager.listGroupsByUserAndSiteGroupId(userId, theGroupId); Set<GCubeGroup> listOfGroups = groupManager.listGroupsByUserAndSiteGroupId(userId, theGroupId);
logger.info("Found {} GcubeGroups", listOfGroups.size()); logger.info("Found {} GcubeGroups (alias VREs) in which the User {} is registred", listOfGroups.size(), user.getUsername());
for (GCubeGroup gCubeGroup : listOfGroups) { for (GCubeGroup gCubeGroup : listOfGroups) {
GcubeScopeType scopeType=null; GcubeScopeType scopeType=null;
@ -174,7 +176,8 @@ public class WsTaskExecutorWidgetServiceImpl extends RemoteServiceServlet implem
List<GcubeScope> dmScopes = new ArrayList<GcubeScope>(listOfScopes.size()); List<GcubeScope> dmScopes = new ArrayList<GcubeScope>(listOfScopes.size());
//GETTING THE ENDPOINTS WHERE THE DM IS DEPLOYED //GETTING THE ENDPOINTS WHERE THE DM IS DEPLOYED
for (GcubeScope gcubeScope : listOfScopes) { for (GcubeScope gcubeScope : listOfScopes) {
boolean exists = RuntimeResourceReader.serviceEndpointExists(scope, "DataMiner", "DataAnalysis"); boolean exists = RuntimeResourceReader.serviceEndpointExists(scope, DM_RESOURCE_NAME, DM_RESOURCE_CATEGORY);
logger.debug("Is the DM deployed in the scope {}? {}",scope, exists);
if(exists) if(exists)
dmScopes.add(gcubeScope); dmScopes.add(gcubeScope);
} }

2
src/main/java/org/gcube/portlets/widgets/wstaskexecutor/server/util/RuntimeResourceReader.java
View File

@ -141,7 +141,7 @@ public class RuntimeResourceReader {
} }
ServiceEndpoint sEp = listEndPoints.get(0); //Returning the first EndPoint. I'm assuming that only one instance exists for input RR ServiceEndpoint sEp = listEndPoints.get(0); //Returning the first EndPoint. I'm assuming that only one instance exists for input RR
logger.info("{} found in the scope {}",ServiceEndpoint.class.getSimpleName(),scope); logger.info("The RR with Profile/Name '{}' and Profile/Category '{}' is found in the instancied scope", resourceName, resourceCategory);
return sEp; return sEp;
} }