Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 6d89c5fa2 -> d95cf60eb
IGNITE-843 Fix log messages and long lines. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d95cf60e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d95cf60e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d95cf60e Branch: refs/heads/ignite-843 Commit: d95cf60eba537bbe5128dfb3dba8678351372ed4 Parents: 6d89c5f Author: sevdokimov <sevdoki...@gridgain.com> Authored: Thu Aug 13 15:38:44 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Thu Aug 13 15:38:44 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/agent/AgentConfiguration.java | 7 ++++--- .../apache/ignite/agent/AgentLoggingConfigurator.java | 5 +++-- .../main/java/org/apache/ignite/agent/AgentSocket.java | 10 +++++----- .../org/apache/ignite/agent/handlers/RestExecutor.java | 4 ---- .../org/apache/ignite/agent/remote/RemoteHandler.java | 12 +++++++----- 5 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d95cf60e/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java index 48b9d2d..ec2674e 100644 --- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java +++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java @@ -36,8 +36,8 @@ public class AgentConfiguration { private String pwd; /** */ - @Parameter(names = {"-s", "--serverUri"}, - description = "Link to web-control-center web-socket server, for example: wss://localhost:3001 or wss://control-center.gridgain.com") + @Parameter(names = {"-s", "--serverUri"}, description = "Link to web-control-center web-socket server, " + + "for example: wss://localhost:3001 or wss://control-center.gridgain.com") private String srvUri = "wss://localhost:3001"; /** */ @@ -49,7 +49,8 @@ public class AgentConfiguration { private String cfgPath; /** */ - @Parameter(names = {"-drv", "--driver-folder"}, description = "Path to folder with JDBC drivers, for example /home/user/drivers") + @Parameter(names = {"-drv", "--driver-folder"}, description = "Path to folder with JDBC drivers, for example " + + "/home/user/drivers") private String driversFolder; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d95cf60e/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLoggingConfigurator.java ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLoggingConfigurator.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLoggingConfigurator.java index 3d63415..d492c45 100644 --- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLoggingConfigurator.java +++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLoggingConfigurator.java @@ -61,10 +61,11 @@ public class AgentLoggingConfigurator { } } - LogManager.getLogManager().readConfiguration(AgentLauncher.class.getResourceAsStream("/" + PROPERTIES_FILE)); + LogManager.getLogManager().readConfiguration(AgentLauncher.class.getResourceAsStream("/" + + PROPERTIES_FILE)); } catch (IOException e) { - System.err.println("Failed to load logging configuration"); + System.err.println("Failed to load logging configuration."); e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d95cf60e/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentSocket.java ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentSocket.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentSocket.java index bab149f..810bf9b 100644 --- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentSocket.java +++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentSocket.java @@ -71,7 +71,7 @@ public class AgentSocket implements WebSocketSender { */ @OnWebSocketClose public void onClose(int statusCode, String reason) { - log.log(Level.INFO, String.format("Connection closed: %d - %s", statusCode, reason)); + log.log(Level.INFO, String.format("Connection closed: %d - %s.", statusCode, reason)); if (remote != null) remote.close(); @@ -84,7 +84,7 @@ public class AgentSocket implements WebSocketSender { */ @OnWebSocketConnect public void onConnect(Session ses) { - log.log(Level.INFO, "Connection established"); + log.log(Level.INFO, "Connection established."); this.ses = ses; @@ -118,7 +118,7 @@ public class AgentSocket implements WebSocketSender { return true; } catch (IOException ignored) { - log.log(Level.SEVERE, "Failed to send message to Control Center"); + log.log(Level.SEVERE, "Failed to send message to Control Center."); return false; } @@ -133,7 +133,7 @@ public class AgentSocket implements WebSocketSender { if (error instanceof ConnectException) log.log(Level.INFO, error.getMessage()); else - log.log(Level.SEVERE, "Connection error", error); + log.log(Level.SEVERE, "Connection error.", error); if (remote != null) remote.close(); @@ -157,7 +157,7 @@ public class AgentSocket implements WebSocketSender { @Remote public void authResult(String errorMsg) { if (errorMsg == null) - log.info("Authentication success"); + log.info("Authentication success."); else { log.info("Authentication failed: " + errorMsg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d95cf60e/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/RestExecutor.java ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/RestExecutor.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/RestExecutor.java index 6531ad9..d8af3b1 100644 --- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/RestExecutor.java +++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/RestExecutor.java @@ -31,16 +31,12 @@ import java.io.*; import java.net.*; import java.nio.charset.*; import java.util.*; -import java.util.logging.*; /** * Executor for REST requests. */ public class RestExecutor { /** */ - private static final Logger log = Logger.getLogger(RestExecutor.class.getName()); - - /** */ private final AgentConfiguration cfg; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d95cf60e/modules/control-center-agent/src/main/java/org/apache/ignite/agent/remote/RemoteHandler.java ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/remote/RemoteHandler.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/remote/RemoteHandler.java index 8199ff5..d63aa7d 100644 --- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/remote/RemoteHandler.java +++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/remote/RemoteHandler.java @@ -47,7 +47,8 @@ public class RemoteHandler implements AutoCloseable { private final Map<String, MethodDescriptor> methods = new HashMap<>(); /** */ - private final ExecutorService executorSrvc = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()); + private final ExecutorService executorSrvc = Executors.newFixedThreadPool(Runtime.getRuntime() + .availableProcessors()); /** * @param snd Session. @@ -61,14 +62,14 @@ public class RemoteHandler implements AutoCloseable { Remote remoteAnn = method.getAnnotation(Remote.class); if (remoteAnn != null) { - MethodDescriptor old = methods.put(method.getName(), new MethodDescriptor(method, hnd, remoteAnn.async())); + MethodDescriptor old = methods.put(method.getName(), new MethodDescriptor(method, hnd, + remoteAnn.async())); if (old != null) throw new IllegalArgumentException("Duplicated method: " + method.getName()); } } } - } /** @@ -126,14 +127,15 @@ public class RemoteHandler implements AutoCloseable { try { res = desc.mtd.invoke(desc.hnd, args); - } catch (Throwable e) { + } + catch (Throwable e) { if (e instanceof InvocationTargetException) e = ((InvocationTargetException)e).getTargetException(); if (reqId != null) sendException(reqId, e.getClass().getName(), e.getMessage()); else - log.log(Level.SEVERE, "Exception on execute remote method", e); + log.log(Level.SEVERE, "Exception on execute remote method.", e); return; }
