diff options
Diffstat (limited to 'platform/remote-servers/agent-rt/src')
6 files changed, 11 insertions, 36 deletions
diff --git a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudAgentLoggingHandler.java b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudAgentLoggingHandler.java index 3dae58e59bb9..7055bace613b 100644 --- a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudAgentLoggingHandler.java +++ b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudAgentLoggingHandler.java @@ -15,10 +15,14 @@ */ package com.intellij.remoteServer.agent.util; +import com.intellij.remoteServer.agent.util.log.LogListener; + /** * @author michael.golubev */ public interface CloudAgentLoggingHandler { void println(String message); + + LogListener getOrCreateLogListener(String pipeName); } diff --git a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudAgentWithDeployment.java b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudAgentWithDeployment.java index 27533ffd1bb8..cf76eaa5216a 100644 --- a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudAgentWithDeployment.java +++ b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudAgentWithDeployment.java @@ -21,10 +21,9 @@ import com.intellij.remoteServer.agent.annotation.ChildCall; * @author michael.golubev */ public interface CloudAgentWithDeployment<Config extends CloudAgentConfig, - DeploymentConfig extends CloudAgentDeploymentConfig, - LoggingHandler extends CloudAgentLoggingHandler> + DeploymentConfig extends CloudAgentDeploymentConfig> extends CloudAgentBase<Config> { @ChildCall - CloudAgentDeployment createDeployment(DeploymentConfig config, LoggingHandler loggingHandler); + CloudAgentDeployment createDeployment(DeploymentConfig config, CloudAgentLoggingHandler loggingHandler); } diff --git a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudGitAgent.java b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudGitAgent.java index cc9867477c7e..bc30b0bce2c8 100644 --- a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudGitAgent.java +++ b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudGitAgent.java @@ -29,5 +29,5 @@ public interface CloudGitAgent<C extends CloudAgentConfigBase, D extends CloudGi void disconnect(); @ChildCall - D createDeployment(String deploymentName, CloudLoggingHandler loggingHandler); + D createDeployment(String deploymentName, CloudAgentLoggingHandler loggingHandler); } diff --git a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudLoggingHandler.java b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudLoggingHandler.java deleted file mode 100644 index 9fad3190e865..000000000000 --- a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/CloudLoggingHandler.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2000-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.remoteServer.agent.util; - -import com.intellij.remoteServer.agent.util.log.LogListener; - -/** - * @author michael.golubev - */ -public interface CloudLoggingHandler extends CloudAgentLoggingHandler { - - LogListener getOrCreateLogListener(String pipeName); -} diff --git a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/log/LogListener.java b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/log/LogListener.java index 564402b19797..06e2896e7867 100644 --- a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/log/LogListener.java +++ b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/log/LogListener.java @@ -20,11 +20,11 @@ package com.intellij.remoteServer.agent.util.log; */ public interface LogListener { - void lineLogged(String line, String deploymentName, String kind); + void lineLogged(String line); LogListener NULL = new LogListener() { - public void lineLogged(String line, String deploymentName, String kind) { + public void lineLogged(String line) { } }; diff --git a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/log/LogPipe.java b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/log/LogPipe.java index 0b7bb1cf77a3..f56fe0940e65 100644 --- a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/log/LogPipe.java +++ b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/log/LogPipe.java @@ -30,16 +30,14 @@ public abstract class LogPipe { private final ILogger myLog; private final String myDeploymentName; - private final String myKind; private boolean myClosed; private int myTotalLines; private int myLines2Skip; - public LogPipe(String deploymentName, String logKind, ILogger log) { + public LogPipe(String deploymentName, ILogger log) { myDeploymentName = deploymentName; - myKind = logKind; myLog = log; myClosed = false; } @@ -73,7 +71,7 @@ public abstract class LogPipe { } if (myLines2Skip == 0) { - getLogListener().lineLogged(line, myDeploymentName, myKind); + getLogListener().lineLogged(line); myTotalLines++; } else { |