From 838db7a08194286362acf4711d1eae9b539c6f01 Mon Sep 17 00:00:00 2001 From: kamhung <22250530@qq.com> Date: Thu, 12 Nov 2015 17:05:16 +0800 Subject: [PATCH] --- src/com/wentch/redkale/boot/Application.java | 3 +- .../wentch/redkale/boot/LogFileHandler.java | 25 ++++++++++++++-- .../wentch/redkale/net/sncp/SncpClient.java | 30 +++++++++++++++---- 3 files changed, 49 insertions(+), 9 deletions(-) diff --git a/src/com/wentch/redkale/boot/Application.java b/src/com/wentch/redkale/boot/Application.java index 42131676f..098666595 100644 --- a/src/com/wentch/redkale/boot/Application.java +++ b/src/com/wentch/redkale/boot/Application.java @@ -152,7 +152,7 @@ public final class Application { if (fileHandlerPattern != null && fileHandlerPattern.contains("%d")) { final String fileHandlerClass = LogFileHandler.class.getName(); Properties prop = new Properties(); - String handlers = properties.getProperty("handlers"); + final String handlers = properties.getProperty("handlers"); if (handlers != null && handlers.contains("java.util.logging.FileHandler")) { prop.setProperty("handlers", handlers.replace("java.util.logging.FileHandler", fileHandlerClass)); } @@ -167,6 +167,7 @@ public final class Application { properties.put(x.getKey(), x.getValue()); }); } + properties.put(SncpClient.class.getSimpleName() + ".handlers", LogFileHandler.SncpLogFileHandler.class.getName()); } ByteArrayOutputStream out = new ByteArrayOutputStream(); final PrintStream ps = new PrintStream(out); diff --git a/src/com/wentch/redkale/boot/LogFileHandler.java b/src/com/wentch/redkale/boot/LogFileHandler.java index 3e40e2411..db422a006 100644 --- a/src/com/wentch/redkale/boot/LogFileHandler.java +++ b/src/com/wentch/redkale/boot/LogFileHandler.java @@ -22,6 +22,14 @@ import java.util.logging.Formatter; */ public class LogFileHandler extends Handler { + public static class SncpLogFileHandler extends LogFileHandler { + + @Override + public String getPrefix() { + return "sncp-"; + } + } + public static class LoggingFormater extends Formatter { private static final String format = "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%tL %4$s %2$s\r\n%5$s%6$s\r\n"; @@ -153,11 +161,24 @@ public class LogFileHandler extends Handler { }.start(); } + public String getPrefix() { + return ""; + } + private void configure() { LogManager manager = LogManager.getLogManager(); - String cname = getClass().getName(); + String cname = LogFileHandler.class.getName(); pattern = manager.getProperty(cname + ".pattern"); - if (pattern == null) pattern = "logs/log-%d.log"; + if (pattern == null) { + pattern = "logs/" + getPrefix() + "log-%d.log"; + } else { + int pos = pattern.lastIndexOf('/'); + if (pos > 0) { + pattern = pattern.substring(0, pos + 1) + getPrefix() + pattern.substring(pos + 1); + } else { + pattern = getPrefix() + pattern; + } + } String limitstr = manager.getProperty(cname + ".limit"); try { if (limitstr != null) limit = Math.abs(Integer.decode(limitstr)); diff --git a/src/com/wentch/redkale/net/sncp/SncpClient.java b/src/com/wentch/redkale/net/sncp/SncpClient.java index 120ce6e56..46253a87e 100644 --- a/src/com/wentch/redkale/net/sncp/SncpClient.java +++ b/src/com/wentch/redkale/net/sncp/SncpClient.java @@ -6,6 +6,7 @@ package com.wentch.redkale.net.sncp; import com.wentch.redkale.convert.bson.*; +import com.wentch.redkale.convert.json.*; import com.wentch.redkale.net.*; import static com.wentch.redkale.net.sncp.SncpRequest.*; import com.wentch.redkale.util.*; @@ -73,7 +74,9 @@ public final class SncpClient { private final Logger logger = Logger.getLogger(SncpClient.class.getSimpleName()); - private final boolean debug = logger.isLoggable(Level.FINEST); + private final boolean finest = logger.isLoggable(Level.FINEST); + + protected final JsonConvert jsonConvert = JsonFactory.root().getConvert(); protected final String name; @@ -182,6 +185,7 @@ public final class SncpClient { try { return convert.convertFrom(actions[index].resultTypes, future.get(5, TimeUnit.SECONDS)); } catch (InterruptedException | ExecutionException | TimeoutException e) { + logger.log(Level.SEVERE, actions[index].method + " sncp (params: " + jsonConvert.convertTo(params) + ") remote error", e); throw new RuntimeException(actions[index].method + " sncp remote error", e); } } @@ -229,7 +233,10 @@ public final class SncpClient { } final SocketAddress addr = action.addressParamIndex >= 0 ? (SocketAddress) params[action.addressParamIndex] : null; final AsyncConnection conn = transport.pollConnection(addr); - if (conn == null || !conn.isOpen()) throw new RuntimeException("sncp " + (conn == null ? addr : conn.getRemoteAddress()) + " cannot connect"); + if (conn == null || !conn.isOpen()) { + logger.log(Level.SEVERE, action.method + " sncp (params: " + jsonConvert.convertTo(params) + ") cannot connect"); + throw new RuntimeException("sncp " + (conn == null ? addr : conn.getRemoteAddress()) + " cannot connect"); + } final int reqBodyLength = bw.count(); //body总长度 final long seqid = System.nanoTime(); @@ -266,7 +273,10 @@ public final class SncpClient { int bodyOffset = buffer.getInt(); // int frameLength = buffer.getInt(); // final int retcode = buffer.getInt(); - if (retcode != 0) throw new RuntimeException("remote service(" + action.method + ") deal error (retcode=" + retcode + ", retinfo=" + SncpResponse.getRetCodeInfo(retcode) + ")"); + if (retcode != 0) { + logger.log(Level.SEVERE, action.method + " sncp (params: " + jsonConvert.convertTo(params) + ") deal error (retcode=" + retcode + ", retinfo=" + SncpResponse.getRetCodeInfo(retcode) + ")"); + throw new RuntimeException("remote service(" + action.method + ") deal error (retcode=" + retcode + ", retinfo=" + SncpResponse.getRetCodeInfo(retcode) + ")"); + } int len = Math.min(buffer.remaining(), frameLength); buffer.get(respBody, bodyOffset, len); received += len; @@ -275,6 +285,7 @@ public final class SncpClient { } catch (RuntimeException e) { throw e; } catch (Exception ex) { + logger.log(Level.SEVERE, action.method + " sncp (params: " + jsonConvert.convertTo(params) + ") udp remote error", ex); throw new RuntimeException(ex); } finally { transport.offerBuffer(buffer); @@ -294,7 +305,10 @@ public final class SncpClient { final DLong actionid = action.actionid; final SocketAddress addr = action.addressParamIndex >= 0 ? (SocketAddress) params[action.addressParamIndex] : null; final AsyncConnection conn = transport.pollConnection(addr); - if (conn == null || !conn.isOpen()) throw new RuntimeException("sncp " + (conn == null ? addr : conn.getRemoteAddress()) + " cannot connect"); + if (conn == null || !conn.isOpen()) { + logger.log(Level.SEVERE, action.method + " sncp (params: " + jsonConvert.convertTo(params) + ") cannot connect"); + throw new RuntimeException("sncp " + (conn == null ? addr : conn.getRemoteAddress()) + " cannot connect"); + } final ByteBuffer[] sendBuffers = writer.toBuffers(); fillHeader(sendBuffers[0], seqid, actionid, reqBodyLength, 0, reqBodyLength); @@ -361,7 +375,10 @@ public final class SncpClient { buffer.getInt(); // bodyOffset buffer.getInt(); // frameLength final int retcode = buffer.getInt(); - if (retcode != 0) throw new RuntimeException("remote service(" + action.method + ") deal error (retcode=" + retcode + ", retinfo=" + SncpResponse.getRetCodeInfo(retcode) + ")"); + if (retcode != 0) { + logger.log(Level.SEVERE, action.method + " sncp (params: " + jsonConvert.convertTo(params) + ") deal error (retcode=" + retcode + ", retinfo=" + SncpResponse.getRetCodeInfo(retcode) + ")"); + throw new RuntimeException("remote service(" + action.method + ") deal error (retcode=" + retcode + ", retinfo=" + SncpResponse.getRetCodeInfo(retcode) + ")"); + } if (respBodyLength > buffer.remaining()) { // 数据不全，需要继续读取 this.body = new byte[respBodyLength]; @@ -384,6 +401,7 @@ public final class SncpClient { @Override public void failed(Throwable exc, Void attachment2) { + logger.log(Level.SEVERE, action.method + " sncp (params: " + jsonConvert.convertTo(params) + ") remote read exec failed", exc); future.set(new RuntimeException(action.method + " sncp remote exec failed")); transport.offerBuffer(buffer); transport.offerConnection(true, conn); @@ -393,7 +411,7 @@ public final class SncpClient { @Override public void failed(Throwable exc, ByteBuffer[] attachment) { - exc.printStackTrace(); + logger.log(Level.SEVERE, action.method + " sncp (params: " + jsonConvert.convertTo(params) + ") remote write exec failed", exc); transport.offerBuffer(buffer); transport.offerConnection(true, conn); }