Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix log redirection

Browse Source
This commit is contained in:
Kris De Volder
2017-11-22 13:03:21 -08:00
parent 80d80758f6
commit cc75054281
7 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java
View File

@@ -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()

4
headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java
View File

@@ -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()));
}

4
headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/Main.java
View File

@@ -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,

14
headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Log.java
View File

@@ -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);
}
}

29
headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/LogRedirect.java Normal file
View File

@@ -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);
}
}

4
headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/Main.java
View File

@@ -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));
}
}

4
headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/Main.java
View File

@@ -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);
}