log datetime

gwttk · Aug 27, 2018 · 9143632 · 9143632
1 parent 1a8b95f
commit 9143632
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/main/java/com/github/immueggpain/common/sct.java b/src/main/java/com/github/immueggpain/common/sct.java
@@ -75,6 +75,14 @@ public static String datetime(long time_ms, String pattern, TimeZone timeZone) {
 		return datetime;
 	}
 
+	/**
+	 * {@link #datetime(long, String, TimeZone) datetime(now, "yyyy-MM-dd HH:mm:ss",
+	 * TimeZone.getDefault())}
+	 */
+	public static String datetime() {
+		return datetime(time_ms(), "yyyy-MM-dd HH:mm:ss", TimeZone.getDefault());
+	}
+
 	/**
 	 * {@link #datetime(long, String, TimeZone) datetime(time_ms,
 	 * "yyyy-MM-dd-HH-mm-ss-SSSXX", TimeZone.getDefault())}

diff --git a/src/main/java/com/github/immueggpain/smartproxy/Smartproxy.java b/src/main/java/com/github/immueggpain/smartproxy/Smartproxy.java
@@ -757,8 +757,8 @@ private Socket create_connect_config_socket(InetSocketAddress dest_sockaddr, Str
 		if (dest_sockaddr.isUnresolved()) {
 			nextNode = domain_to_nn.get(dest_sockaddr.getHostString());
 			if (nextNode != null) {
-				log.println(
-						String.format("%-7s: %-6s <- %s", client_protocol, nextNode, dest_sockaddr.getHostString()));
+				log.println(String.format("%s %-7s: %-6s <- %s", sct.datetime(), client_protocol, nextNode,
+						dest_sockaddr.getHostString()));
 			} else {
 				String intermediate = "." + dest_sockaddr.getHostString();
 				while (true) {
@@ -772,11 +772,11 @@ private Socket create_connect_config_socket(InetSocketAddress dest_sockaddr, Str
 				}
 				if (nextNode == null) {
 					nextNode = nn_proxy;
-					log.println(String.format("%-7s: %-6s <- default <- %s", client_protocol, nextNode,
-							dest_sockaddr.getHostString()));
+					log.println(String.format("%s %-7s: %-6s <- default <- %s", sct.datetime(), client_protocol,
+							nextNode, dest_sockaddr.getHostString()));
 				} else {
-					log.println(String.format("%-7s: %-6s <- %s <- %s", client_protocol, nextNode, intermediate,
-							dest_sockaddr.getHostString()));
+					log.println(String.format("%s %-7s: %-6s <- %s <- %s", sct.datetime(), client_protocol, nextNode,
+							intermediate, dest_sockaddr.getHostString()));
 				}
 			}
 		} else {