Repository: airavata Updated Branches: refs/heads/lahiru/AIRAVATA-2065 c24e90ef6 -> 1211aa484
Use String.format Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1211aa48 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1211aa48 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1211aa48 Branch: refs/heads/lahiru/AIRAVATA-2065 Commit: 1211aa484ca2d57ba2bca67d99483368dd36c63e Parents: c24e90e Author: Lahiru Ginnaliya Gamathige <[email protected]> Authored: Mon Sep 26 23:47:58 2016 -0700 Committer: Lahiru Ginnaliya Gamathige <[email protected]> Committed: Mon Sep 26 23:47:58 2016 -0700 ---------------------------------------------------------------------- .../common/logging/kafka/KafkaAppender.java | 16 ++-------------- .../airavata/gfac/core/context/ProcessContext.java | 4 ++-- .../airavata/gfac/core/context/TaskContext.java | 4 ++-- .../server/OrchestratorServerHandler.java | 4 ++-- 4 files changed, 8 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/1211aa48/modules/commons/src/main/java/org/apache/airavata/common/logging/kafka/KafkaAppender.java ---------------------------------------------------------------------- diff --git a/modules/commons/src/main/java/org/apache/airavata/common/logging/kafka/KafkaAppender.java b/modules/commons/src/main/java/org/apache/airavata/common/logging/kafka/KafkaAppender.java index 37240b1..0617bcf 100644 --- a/modules/commons/src/main/java/org/apache/airavata/common/logging/kafka/KafkaAppender.java +++ b/modules/commons/src/main/java/org/apache/airavata/common/logging/kafka/KafkaAppender.java @@ -84,30 +84,18 @@ public class KafkaAppender extends UnsynchronizedAppenderBase<ILoggingEvent> { !event.getLevel().equals(Level.OFF)) { final IThrowableProxy throwableProxy = event.getThrowableProxy(); final LogEntry entry = throwableProxy != null ? - new LogEntry(serverId, createMessage(event), Instant.ofEpochMilli(event.getTimeStamp()).toString(), + new LogEntry(serverId, event.getMessage(), Instant.ofEpochMilli(event.getTimeStamp()).toString(), event.getLevel().toString(), event.getLoggerName(), event.getMDCPropertyMap(), event.getThreadName() != null ? event.getThreadName() : null, new Exception(throwableProxy.getMessage(), toStringArray(throwableProxy.getStackTraceElementProxyArray()) , throwableProxy.getClassName())) - : new LogEntry(serverId, createMessage(event), Instant.ofEpochMilli(event.getTimeStamp()).toString(), + : new LogEntry(serverId, event.getMessage(), Instant.ofEpochMilli(event.getTimeStamp()).toString(), event.getLevel().toString(), event.getLoggerName(), event.getMDCPropertyMap(), event.getThreadName() != null ? event.getThreadName() : null); producer.send(new ProducerRecord<>(kafkaTopic, new Gson().toJson(entry))); } } - private String createMessage(ILoggingEvent event) { - String message = event.getMessage(); - final Object[] arguments = event.getArgumentArray(); - if (arguments.length > 0) { - int maxLength = arguments.length < 3 ? arguments.length : 3; - for (int i = 0; i < maxLength; i++) { - message = event.getMessage().replaceFirst("\\{\\}", arguments[i].toString()); - } - } - return message; - } - private String[] toStringArray(StackTraceElementProxy[] stackTraceElement) { return Arrays.stream(stackTraceElement).map(StackTraceElementProxy::getSTEAsString).toArray(String[]::new); http://git-wip-us.apache.org/repos/asf/airavata/blob/1211aa48/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java index 8a2cc4e..4b40159 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java @@ -370,8 +370,8 @@ public class ProcessContext { public void setProcessStatus(ProcessStatus status) { if (status != null) { - log.info("expId: {}, processId: {} :- Process status changed {} -> {}", getExperimentId(), processId, - getProcessState().name(), status.getState().name()); + log.info(String.format("expId: %s, processId: %s :- Process status changed %s -> %s", getExperimentId(), processId, + getProcessState().name(), status.getState().name())); List<ProcessStatus> processStatuses = new ArrayList<>(); processStatuses.add(status); processModel.setProcessStatuses(processStatuses); http://git-wip-us.apache.org/repos/asf/airavata/blob/1211aa48/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/TaskContext.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/TaskContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/TaskContext.java index 6f95d3d..74e8b65 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/TaskContext.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/TaskContext.java @@ -64,9 +64,9 @@ public class TaskContext { } public void setTaskStatus(TaskStatus taskStatus) { - log.info("expId: {}, processId: {}, taskId: {}, type: {}:- Task status changed {} -> {}", parentProcessContext + log.info(String.format("expId: %s, processId: %s, taskId: %s, type: %s : Task status changed %s -> %s", parentProcessContext .getExperimentId(), parentProcessContext.getProcessId(), getTaskId(), getTaskType().name(), - getTaskState().name(), taskStatus .getState().name()); + getTaskState().name(), taskStatus .getState().name())); List<TaskStatus> taskStatuses = new ArrayList<>(); taskStatuses.add(taskStatus); taskModel.setTaskStatuses(taskStatuses); http://git-wip-us.apache.org/repos/asf/airavata/blob/1211aa48/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java index a1a31bf..d9b6978 100644 --- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java +++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java @@ -142,7 +142,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface { ZKPaths.mkdirs(curatorClient.getZookeeperClient().getZooKeeper(), experimentCancelNode); experiment = (ExperimentModel) experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT, experimentId); if (experiment == null) { - log.error(experimentId, "Error retrieving the Experiment by the given experimentID: {} ", experimentId); + log.error("Experiment ID should not be NULL"); return false; } @@ -632,7 +632,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface { byte[] bytes = ThriftUtils.serializeThriftObject(messageContext.getEvent()); ThriftUtils.createThriftFromBytes(bytes, expEvent); MDC.put(MDCConstants.EXPERIMENT_ID, expEvent.getExperimentId()); - log.info("Launching experiment with experimentId: {} gateway Id: {}", expEvent.getExperimentId(), expEvent.getGatewayId()); + log.info(String.format("Launching experiment with experimentId: %s gateway Id: %s", expEvent.getExperimentId(), expEvent.getGatewayId())); if (messageContext.isRedeliver()) { ExperimentModel experimentModel = (ExperimentModel) experimentCatalog. get(ExperimentCatalogModelType.EXPERIMENT, expEvent.getExperimentId());
