Move CommandCenterLog to sentinel-transport-common and polish related…

… code (alibaba#1341) Signed-off-by: Eric Zhao <[email protected]>
wlheckel · Mar 16, 2020 · e476929 · e476929
1 parent 624d19d
commit e476929
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 14 deletions.
diff --git a/...k/src/main/java/com/alibaba/csp/sentinel/demo/log/logback/CommandCenterLogLoggerImpl.java b/...k/src/main/java/com/alibaba/csp/sentinel/demo/log/logback/CommandCenterLogLoggerImpl.java
@@ -15,7 +15,7 @@
  */
 package com.alibaba.csp.sentinel.demo.log.logback;
 
-import com.alibaba.csp.sentinel.log.CommandCenterLog;
+import com.alibaba.csp.sentinel.transport.log.CommandCenterLog;
 import com.alibaba.csp.sentinel.log.LogTarget;
 import com.alibaba.csp.sentinel.log.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...logback/src/test/java/com/alibaba/csp/sentinel/demo/log/logback/CommandCenterLogTest.java b/...logback/src/test/java/com/alibaba/csp/sentinel/demo/log/logback/CommandCenterLogTest.java
@@ -15,7 +15,7 @@
  */
 package com.alibaba.csp.sentinel.demo.log.logback;
 
-import com.alibaba.csp.sentinel.log.CommandCenterLog;
+import com.alibaba.csp.sentinel.transport.log.CommandCenterLog;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/...ba/csp/sentinel/log/CommandCenterLog.java → ...tinel/transport/log/CommandCenterLog.java b/...ba/csp/sentinel/log/CommandCenterLog.java → ...tinel/transport/log/CommandCenterLog.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.csp.sentinel.log;
+package com.alibaba.csp.sentinel.transport.log;
 
+import com.alibaba.csp.sentinel.log.LoggerSpiProvider;
 import com.alibaba.csp.sentinel.log.jul.JavaLoggingAdapter;
 
 /**

diff --git a/...http/src/main/java/com/alibaba/csp/sentinel/transport/command/NettyHttpCommandCenter.java b/...http/src/main/java/com/alibaba/csp/sentinel/transport/command/NettyHttpCommandCenter.java
@@ -49,9 +49,8 @@ public void run() {
                 try {
                     server.start();
                 } catch (Exception ex) {
-                    RecordLog.info("Start netty server error", ex);
+                    RecordLog.warn("[NettyHttpCommandCenter] Failed to start Netty transport server", ex);
                     ex.printStackTrace();
-                    System.exit(-1);
                 }
             }
         });

diff --git a/...netty-http/src/main/java/com/alibaba/csp/sentinel/transport/command/netty/HttpServer.java b/...netty-http/src/main/java/com/alibaba/csp/sentinel/transport/command/netty/HttpServer.java
@@ -21,7 +21,7 @@
 import java.util.concurrent.TimeUnit;
 
 import com.alibaba.csp.sentinel.command.CommandHandler;
-import com.alibaba.csp.sentinel.log.CommandCenterLog;
+import com.alibaba.csp.sentinel.transport.log.CommandCenterLog;
 import com.alibaba.csp.sentinel.log.RecordLog;
 import com.alibaba.csp.sentinel.transport.config.TransportConfig;
 import com.alibaba.csp.sentinel.util.StringUtil;
@@ -78,7 +78,7 @@ public void start() throws Exception {
                     break;
                 } catch (Exception e) {
                     TimeUnit.MILLISECONDS.sleep(30);
-                    RecordLog.warn("[HttpServer] Netty server bind error, port={0}, retry={1}", newPort, retryCount);
+                    RecordLog.warn("[HttpServer] Netty server bind error, port={}, retry={}", newPort, retryCount);
                     retryCount ++;
                 }
             }

diff --git a/...ttp/src/main/java/com/alibaba/csp/sentinel/transport/command/netty/HttpServerHandler.java b/...ttp/src/main/java/com/alibaba/csp/sentinel/transport/command/netty/HttpServerHandler.java
@@ -25,7 +25,7 @@
 import com.alibaba.csp.sentinel.command.CommandRequest;
 import com.alibaba.csp.sentinel.command.CommandResponse;
 import com.alibaba.csp.sentinel.config.SentinelConfig;
-import com.alibaba.csp.sentinel.log.CommandCenterLog;
+import com.alibaba.csp.sentinel.transport.log.CommandCenterLog;
 import com.alibaba.csp.sentinel.transport.command.codec.CodecRegistry;
 import com.alibaba.csp.sentinel.transport.command.codec.Encoder;
 import com.alibaba.csp.sentinel.transport.util.HttpCommandUtils;

diff --git a/...ttp/src/main/java/com/alibaba/csp/sentinel/transport/command/SimpleHttpCommandCenter.java b/...ttp/src/main/java/com/alibaba/csp/sentinel/transport/command/SimpleHttpCommandCenter.java
@@ -34,7 +34,7 @@
 import com.alibaba.csp.sentinel.command.CommandHandler;
 import com.alibaba.csp.sentinel.command.CommandHandlerProvider;
 import com.alibaba.csp.sentinel.concurrent.NamedThreadFactory;
-import com.alibaba.csp.sentinel.log.CommandCenterLog;
+import com.alibaba.csp.sentinel.transport.log.CommandCenterLog;
 import com.alibaba.csp.sentinel.transport.CommandCenter;
 import com.alibaba.csp.sentinel.transport.command.http.HttpEventTask;
 import com.alibaba.csp.sentinel.transport.config.TransportConfig;

diff --git a/...ple-http/src/main/java/com/alibaba/csp/sentinel/transport/command/http/HttpEventTask.java b/...ple-http/src/main/java/com/alibaba/csp/sentinel/transport/command/http/HttpEventTask.java
@@ -19,7 +19,7 @@
 import com.alibaba.csp.sentinel.command.CommandRequest;
 import com.alibaba.csp.sentinel.command.CommandResponse;
 import com.alibaba.csp.sentinel.config.SentinelConfig;
-import com.alibaba.csp.sentinel.log.CommandCenterLog;
+import com.alibaba.csp.sentinel.transport.log.CommandCenterLog;
 import com.alibaba.csp.sentinel.transport.command.SimpleHttpCommandCenter;
 import com.alibaba.csp.sentinel.transport.command.exception.RequestException;
 import com.alibaba.csp.sentinel.transport.util.HttpCommandUtils;
@@ -126,7 +126,7 @@ public void run() {
                     printWriter.flush();
                 }
             } catch (Exception e1) {
-                CommandCenterLog.warn("[SimpleHttpCommandCenter] Close server socket failed", e);
+                CommandCenterLog.warn("Failed to write error response", e1);
             }
         } finally {
             closeResource(inputStream);

diff --git a/...p/src/main/java/com/alibaba/csp/sentinel/transport/heartbeat/client/SimpleHttpClient.java b/...p/src/main/java/com/alibaba/csp/sentinel/transport/heartbeat/client/SimpleHttpClient.java
@@ -25,7 +25,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.alibaba.csp.sentinel.log.CommandCenterLog;
 import com.alibaba.csp.sentinel.log.RecordLog;
 
 /**
@@ -125,7 +124,7 @@ private SimpleHttpResponse request(InetSocketAddress socketAddress,
                 try {
                     socket.close();
                 } catch (Exception ex) {
-                    CommandCenterLog.info("Error when closing " + type + " request to " + socketAddress + ": ", ex);
+                    RecordLog.warn("Error when closing {} request to {} in SimpleHttpClient", type, socketAddress, ex);
                 }
             }
         }
@@ -177,7 +176,7 @@ private String encodeRequestParams(Map<String, String> paramsMap, Charset charse
             }
             return paramsBuilder.toString();
         } catch (Throwable e) {
-            RecordLog.info("Encode request params fail", e);
+            RecordLog.warn("Encode request params fail", e);
             return "";
         }
     }