You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/06/21 00:55:10 UTC
svn commit: r1352361 - in
/incubator/airavata/branches/0.3-incubating-snapshot/modules:
gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/
gfac-core/src/main/java/org/apache/airavata/core/gfac/
gfac-core/src/main/java/org/apache...
Author: lahiru
Date: Wed Jun 20 22:55:10 2012
New Revision: 1352361
URL: http://svn.apache.org/viewvc?rev=1352361&view=rev
Log:
adding a temporary logging solution for gfac.
Modified:
incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java
incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java
incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java
incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
Modified: incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java?rev=1352361&r1=1352360&r2=1352361&view=diff
==============================================================================
--- incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java (original)
+++ incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java Wed Jun 20 22:55:10 2012
@@ -72,7 +72,7 @@ import org.slf4j.LoggerFactory;
public class GFacMessageReciever implements MessageReceiver {
- private static final Logger log = LoggerFactory.getLogger(GFacMessageReciever.class);
+ private static Logger log = LoggerFactory.getLogger(GFacMessageReciever.class);
public static final String TRUSTED_CERT_LOCATION = "trusted.cert.location";
public static final String MYPROXY_SERVER = "myproxy.server";
public static final String MYPROXY_USER = "myproxy.user";
@@ -81,7 +81,7 @@ public class GFacMessageReciever impleme
private GFacConfiguration gfacContext;
private GenericService service;
private Axis2Registry registry;
- private final GfacAPI gfacAPI = new GfacAPI();
+ private GfacAPI gfacAPI;
public void receive(org.apache.axis2.context.MessageContext axisRequestMsgCtx) throws AxisFault {
GFacServiceOperations operation = GFacServiceOperations.valueFrom(axisRequestMsgCtx.getOperationContext()
@@ -99,6 +99,8 @@ public class GFacMessageReciever impleme
break;
case INVOKE:
try {
+ ContextHeaderDocument document = ContextHeaderDocument.Factory.parse(getHeader(axisRequestMsgCtx).toStringWithConsume());
+ log = LoggerFactory.getLogger(GFacMessageReciever.class + "." + document.getContextHeader().getWorkflowMonitoringContext().getExperimentId());
log.debug("invoking Invoke operation");
processInvokeOperation(axisRequestMsgCtx);
log.info(axisRequestMsgCtx.getEnvelope().getBody().getFirstElement().toString());
@@ -107,7 +109,7 @@ public class GFacMessageReciever impleme
throw new AxisFault("Error Invoking the service", e);
}
break;
- case GETWSDL:
+ case GETWSDL:
try {
log.debug("invoking getWSDL operation");
processgetWSDLOperation(axisRequestMsgCtx);
@@ -172,7 +174,6 @@ public class GFacMessageReciever impleme
}
//Set the WorkflowContext Header to the ThreadLocal of the Gfac Service, so that this can be accessed easilly
WorkflowContextHeaderBuilder.setCurrentContextHeader(document.getContextHeader());
-
Map<Parameter,ActualParameter> actualParameters = new LinkedHashMap<Parameter,ActualParameter>();
ServiceDescription serviceDescription = getRegistry(context).getServiceDescription(serviceName);
ServiceDescriptionType serviceDescriptionType = serviceDescription.getType();
@@ -192,8 +193,9 @@ public class GFacMessageReciever impleme
if(document.getContextHeader().getSecurityContext().getAmazonWebservices() != null){
// invocationContext.getExecutionContext().setSecurityContextHeader(header);
//todo if there's amazoneWebServices context we need to set that value, this will refer in EC2Provider
- }else{
- invocationContext = gfacAPI.gridJobSubmit(jobContext,(GFacConfiguration)context.getProperty(GFacService.GFAC_CONFIGURATION));
+ }else {
+ gfacAPI = new GfacAPI();
+ invocationContext = gfacAPI.gridJobSubmit(jobContext, (GFacConfiguration) context.getProperty(GFacService.GFAC_CONFIGURATION));
}
try {
/*
Modified: incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java?rev=1352361&r1=1352360&r2=1352361&view=diff
==============================================================================
--- incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java (original)
+++ incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java Wed Jun 20 22:55:10 2012
@@ -44,7 +44,8 @@ import java.net.URI;
import java.util.Map;
public class GfacAPI {
- private static final Logger log = LoggerFactory.getLogger(GfacAPI.class);
+ private static final Logger log = LoggerFactory.getLogger(GfacAPI.class +
+ "." + WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getExperimentId());
public static final String REPOSITORY_PROPERTIES = "repository.properties";
public DefaultInvocationContext gridJobSubmit(JobContext jobContext,GFacConfiguration gfacConfig) throws Exception {
Modified: incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java?rev=1352361&r1=1352360&r2=1352361&view=diff
==============================================================================
--- incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java (original)
+++ incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java Wed Jun 20 22:55:10 2012
@@ -20,6 +20,7 @@
*/
package org.apache.airavata.core.gfac.notification.impl;
+import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.notification.GFacNotifiable;
import org.slf4j.Logger;
@@ -31,7 +32,8 @@ import org.slf4j.LoggerFactory;
*/
public class LoggingNotification implements GFacNotifiable {
- protected final Logger log = LoggerFactory.getLogger(LoggingNotification.class);
+ protected final Logger log = LoggerFactory.getLogger(LoggingNotification.class+
+ "." + WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getExperimentId());
public void startSchedule(InvocationContext context) {
printOut(context, "Start scheduling");
Modified: incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java?rev=1352361&r1=1352360&r2=1352361&view=diff
==============================================================================
--- incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java (original)
+++ incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java Wed Jun 20 22:55:10 2012
@@ -23,6 +23,7 @@ package org.apache.airavata.core.gfac.pr
import java.util.Map;
+import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.exception.*;
import org.apache.airavata.core.gfac.notification.GFacNotifier;
@@ -38,8 +39,8 @@ import org.slf4j.LoggerFactory;
* - retrieveOutput <br/>
*/
public abstract class AbstractProvider implements Provider {
- protected final Logger log = LoggerFactory.getLogger(this.getClass());
-
+ protected final Logger log = LoggerFactory.getLogger(this.getClass() +
+ "." + WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getExperimentId());
public void initialize(InvocationContext invocationContext) throws ProviderException {
/*
* Make a directory on the host
Modified: incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java?rev=1352361&r1=1352360&r2=1352361&view=diff
==============================================================================
--- incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java (original)
+++ incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java Wed Jun 20 22:55:10 2012
@@ -28,6 +28,7 @@ import java.util.Map;
import javax.xml.stream.XMLStreamException;
import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
@@ -54,7 +55,8 @@ import org.slf4j.LoggerFactory;
*/
public class SchedulerImpl implements Scheduler {
- private static Logger log = LoggerFactory.getLogger(SchedulerImpl.class);
+ private static Logger log = LoggerFactory.getLogger(SchedulerImpl.class+
+ "." + WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getExperimentId());
public Provider schedule(InvocationContext context) throws SchedulerException {
Modified: incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java?rev=1352361&r1=1352360&r2=1352361&view=diff
==============================================================================
--- incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java (original)
+++ incubator/airavata/branches/0.3-incubating-snapshot/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java Wed Jun 20 22:55:10 2012
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.airavata.common.registry.api.impl.JCRRegistry;
+import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.context.invocation.impl.DefaultExecutionContext;
import org.apache.airavata.core.gfac.context.security.impl.GSISecurityContext;
@@ -55,7 +56,8 @@ import org.slf4j.LoggerFactory;
*/
public class PropertiesBasedServiceImpl extends AbstractSimpleService {
- private static Logger log = LoggerFactory.getLogger(PropertiesBasedServiceImpl.class);
+ private static Logger log = LoggerFactory.getLogger(PropertiesBasedServiceImpl.class+
+ "." + WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getExperimentId());
/*
* default properties file location