From cc750542815abdd330a8368fec798533e025b137 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 22 Nov 2017 13:03:21 -0800 Subject: [PATCH] Attempt to fix log redirection --- .../ide/vscode/boot/java/Main.java | 4 +-- .../springframework/ide/vscode/boot/Main.java | 4 +-- .../springframework/ide/vscode/bosh/Main.java | 4 +-- .../ide/vscode/commons/util/Log.java | 14 --------- .../ide/vscode/commons/util/LogRedirect.java | 29 +++++++++++++++++++ .../ide/vscode/concourse/Main.java | 4 +-- .../ide/vscode/manifest/yaml/Main.java | 4 +-- 7 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/LogRedirect.java diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java index e916c963a..f9841bd8d 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java @@ -14,7 +14,7 @@ import java.io.IOException; import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; -import org.springframework.ide.vscode.commons.util.Log; +import org.springframework.ide.vscode.commons.util.LogRedirect; /** * Starts up Language Server process @@ -25,7 +25,7 @@ public class Main { public static void main(String[] args) throws IOException, InterruptedException { String serverName = "boot-java-language-server"; - Log.redirectToFile(serverName); + LogRedirect.redirectToFile(serverName); LaunguageServerApp.start(serverName, () -> { SimpleLanguageServer server = new BootJavaLanguageServer( BootJavaLanguageServerParams.createDefault() diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java index 6c82ae8aa..e67c52158 100644 --- a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java +++ b/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java @@ -13,7 +13,7 @@ package org.springframework.ide.vscode.boot; import java.io.IOException; import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp; -import org.springframework.ide.vscode.commons.util.Log; +import org.springframework.ide.vscode.commons.util.LogRedirect; /** * Starts up Language Server process @@ -26,7 +26,7 @@ public class Main { public static void main(String[] args) throws IOException, InterruptedException { String serverName = "boot-properties-language-server"; - Log.redirectToFile(serverName); + LogRedirect.redirectToFile(serverName); LaunguageServerApp.start(serverName, () -> new BootPropertiesLanguageServer(BootPropertiesLanguageServerParams.createDefault())); } diff --git a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/Main.java b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/Main.java index 4629e5229..457be6e1e 100644 --- a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/Main.java +++ b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/Main.java @@ -16,12 +16,12 @@ import org.springframework.ide.vscode.bosh.models.BoshCommandCloudConfigProvider import org.springframework.ide.vscode.bosh.models.BoshCommandReleasesProvider; import org.springframework.ide.vscode.bosh.models.BoshCommandStemcellsProvider; import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp; -import org.springframework.ide.vscode.commons.util.Log; +import org.springframework.ide.vscode.commons.util.LogRedirect; public class Main { public static void main(String[] args) throws IOException, InterruptedException { String serverName = "bosh-language-server"; - Log.redirectToFile(serverName); + LogRedirect.redirectToFile(serverName); BoshCliConfig cliConfig = new BoshCliConfig(); LaunguageServerApp.start(serverName, () -> new BoshLanguageServer( cliConfig, diff --git a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Log.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Log.java index a5705585a..75ccf5b1f 100644 --- a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Log.java +++ b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Log.java @@ -11,9 +11,6 @@ package org.springframework.ide.vscode.commons.util; -import java.io.File; -import java.io.IOException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,15 +53,4 @@ public class Log { logger.warn(msg, e); } - public static void redirectToFile(String name) throws IOException { - File logfile = null; - if (System.getProperty("org.slf4j.simpleLogger.logFile") == null) { - logfile = File.createTempFile(name, ".log"); - System.setProperty("org.slf4j.simpleLogger.logFile", logfile.toString()); - } else { - logfile = new File(System.getProperty("org.slf4j.simpleLogger.logFile")); - } - System.err.println("Redirecting log output to: "+logfile); - } - } diff --git a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/LogRedirect.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/LogRedirect.java new file mode 100644 index 000000000..46aecf74c --- /dev/null +++ b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/LogRedirect.java @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2017 Pivotal, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.commons.util; + +import java.io.File; +import java.io.IOException; + +public class LogRedirect { + + public static void redirectToFile(String name) throws IOException { + File logfile = null; + if (System.getProperty("org.slf4j.simpleLogger.logFile") == null) { + logfile = File.createTempFile(name, ".log"); + System.setProperty("org.slf4j.simpleLogger.logFile", logfile.toString()); + } else { + logfile = new File(System.getProperty("org.slf4j.simpleLogger.logFile")); + } + System.err.println("Redirecting log output to: "+logfile); + } + +} diff --git a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/Main.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/Main.java index ef6fce397..7a331cbc2 100644 --- a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/Main.java +++ b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/Main.java @@ -14,7 +14,7 @@ package org.springframework.ide.vscode.concourse; import java.io.IOException; import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp; -import org.springframework.ide.vscode.commons.util.Log; +import org.springframework.ide.vscode.commons.util.LogRedirect; import org.springframework.ide.vscode.commons.yaml.completion.YamlCompletionEngineOptions; public class Main { @@ -22,7 +22,7 @@ public class Main { public static void main(String[] args) throws IOException, InterruptedException { String serverName = "concourse-language-server"; - Log.redirectToFile(serverName); + LogRedirect.redirectToFile(serverName); LaunguageServerApp.start(serverName, () -> new ConcourseLanguageServer(OPTIONS)); } } diff --git a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java index 228bf7263..3bfafd1e1 100644 --- a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java +++ b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java @@ -14,14 +14,14 @@ import java.io.IOException; import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; -import org.springframework.ide.vscode.commons.util.Log; +import org.springframework.ide.vscode.commons.util.LogRedirect; public class Main { SimpleLanguageServer server = new ManifestYamlLanguageServer(); public static void main(String[] args) throws IOException, InterruptedException { String serverName = "manifest-yaml-language-server"; - Log.redirectToFile(serverName); + LogRedirect.redirectToFile(serverName); LaunguageServerApp.start(serverName, ManifestYamlLanguageServer::new); }