From 2a2b7a486aded4a4d713f35c330a47daf6f1365e Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 3 Oct 2018 11:06:39 -0700 Subject: [PATCH] Remove obsolet LoggingFormat We should now rely on spring boot to configure logging. --- .../languageserver/LanguageServerRunner.java | 4 - .../languageserver/util/LoggingFormat.java | 82 ------------------- 2 files changed, 86 deletions(-) delete mode 100644 headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/LoggingFormat.java diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LanguageServerRunner.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LanguageServerRunner.java index ff91453a9..eedbc546e 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LanguageServerRunner.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LanguageServerRunner.java @@ -8,7 +8,6 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ - package org.springframework.ide.vscode.commons.languageserver; import java.io.IOException; @@ -36,7 +35,6 @@ import org.eclipse.lsp4j.services.LanguageServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.CommandLineRunner; -import org.springframework.ide.vscode.commons.languageserver.util.LoggingFormat; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.util.Log; @@ -138,9 +136,7 @@ public class LanguageServerRunner implements CommandLineRunner { Log.info("Starting LS"); Connection connection = null; try { - LoggingFormat.startLogging(); connection = connectToNode(); - runAsync(connection).get(); } catch (Throwable t) { Log.log(t); diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/LoggingFormat.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/LoggingFormat.java deleted file mode 100644 index 24d63aeec..000000000 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/LoggingFormat.java +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016-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.languageserver.util; - -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.time.Instant; -import java.util.StringJoiner; -import java.util.logging.Formatter; -import java.util.logging.Handler; -import java.util.logging.LogRecord; -import java.util.logging.Logger; - -public class LoggingFormat extends Formatter { - public static ThreadLocal request = new ThreadLocal<>(); - - @Override - public String format(LogRecord record) { - StringJoiner joiner = new StringJoiner("\t"); - - joiner.add(record.getLevel().getName()); - joiner.add(requestAsString()); - joiner.add(Thread.currentThread().getName()); - joiner.add(Instant.ofEpochMilli(record.getMillis()).toString()); - // joiner.add(record.getLoggerName()); - joiner.add(record.getSourceClassName() + "#" + record.getSourceMethodName()); - joiner.add(record.getMessage()); - - String result = joiner.toString() + "\n"; - - Throwable thrown = record.getThrown(); - - if (thrown != null) { - StringWriter stackTrace = new StringWriter(); - PrintWriter print = new PrintWriter(stackTrace); - - thrown.printStackTrace(print); - print.flush(); - - result = result + stackTrace + "\n"; - } - - return result; - } - - private CharSequence requestAsString() { - Integer i = request.get(); - - if (i == null) - return "?"; - else - return Integer.toString(i); - } - - private static boolean started = false; - - public static void startLogging() throws IOException { - if (!started) { - started = true; - - Logger root = Logger.getLogger(""); -// for (Handler h : ImmutableList.copyOf(root.getHandlers())) { -// root.removeHandler(h); -// } -// FileHandler file = new FileHandler("sts4-extension.%g.log", 100_000, 1, false); -// root.addHandler(file); - - for (Handler h : root.getHandlers()) - h.setFormatter(new LoggingFormat()); - } - } -}