From 82cc746876d6f1bd5c689c66845e42de0e894ed0 Mon Sep 17 00:00:00 2001 From: chengwang15 Date: Fri, 2 Sep 2022 14:53:57 +0800 Subject: [PATCH] remove String.format in logs --- .../mlsql/crawler/HttpClientCrawler.scala | 46 +++++++------------ .../test/scala/tech/mlsql/it/Comparator.scala | 4 +- .../dsl/mmlib/algs/SQLDownloadExt.scala | 14 ++---- .../java/tech/mlsql/tool/TarfileUtil.java | 19 ++++---- .../java/streaming/core/DownloadRunner.java | 17 +++---- 5 files changed, 37 insertions(+), 63 deletions(-) diff --git a/streamingpro-core/src/main/java/tech/mlsql/crawler/HttpClientCrawler.scala b/streamingpro-core/src/main/java/tech/mlsql/crawler/HttpClientCrawler.scala index a94b39d66..1227520bf 100644 --- a/streamingpro-core/src/main/java/tech/mlsql/crawler/HttpClientCrawler.scala +++ b/streamingpro-core/src/main/java/tech/mlsql/crawler/HttpClientCrawler.scala @@ -72,15 +72,11 @@ object HttpClientCrawler { } else null } catch { case e: Exception => - if (log.isDebugEnabled()) { - log.debug( - String.format( - "request Error: %s\n url: %s", - e, - url - ) - ) - } + log.error( + "Request Error: {}\n url: {}", + e, + url + ) null } finally { if (response != null) { @@ -121,17 +117,13 @@ object HttpClientCrawler { params.keys.foreach(i => paramToString += String.format("{ %s, %s }", i, params(i))) paramToString += "]" - if (log.isDebugEnabled()) { - log.debug( - String.format( - "requestByMethod Error: %s\n url: %s\n method: %s\n params: %s", - e, - url, - method, - paramToString - ) - ) - } + log.error( + "Error: {}\n url: {}\n method: {}\n params: {}", + e, + url, + method, + paramToString + ) null } finally { if (response != null) { @@ -155,15 +147,11 @@ object HttpClientCrawler { } else null } catch { case e: Exception => - if (log.isDebugEnabled()) { - log.debug( - String.format( - "requestImage Error: %s\n url: %s", - e, - url - ) - ) - } + log.error( + "Error: {}\n url: {}", + e, + url + ) null } finally { if (response != null) { diff --git a/streamingpro-it/src/test/scala/tech/mlsql/it/Comparator.scala b/streamingpro-it/src/test/scala/tech/mlsql/it/Comparator.scala index 3440e9b43..76dc367da 100644 --- a/streamingpro-it/src/test/scala/tech/mlsql/it/Comparator.scala +++ b/streamingpro-it/src/test/scala/tech/mlsql/it/Comparator.scala @@ -28,9 +28,7 @@ class DefaultComparator extends Comparator with Logging{ def getExceptionStackAsString(exception: Exception): String = { val sw = new StringWriter() val pw = new PrintWriter(sw) - if (log.isDebugEnabled()) { - log.debug(String.format("Error: %s\n PrintWriter: %s", exception, pw.toString)) - } + log.error("Error: {}\n PrintWriter: {}", exception, pw.toString) sw.toString } diff --git a/streamingpro-mlsql/src/main/java/streaming/dsl/mmlib/algs/SQLDownloadExt.scala b/streamingpro-mlsql/src/main/java/streaming/dsl/mmlib/algs/SQLDownloadExt.scala index 46c0a2874..dbb2f9746 100644 --- a/streamingpro-mlsql/src/main/java/streaming/dsl/mmlib/algs/SQLDownloadExt.scala +++ b/streamingpro-mlsql/src/main/java/streaming/dsl/mmlib/algs/SQLDownloadExt.scala @@ -136,15 +136,11 @@ class SQLDownloadExt(override val uid: String) extends SQLAlg with DslTool with } catch { case e: Exception => - if (log.isDebugEnabled()) { - log.debug( - String.format( - "urlencode Error: %s\n getUrl: %s", - e, - getUrl - ) - ) - } + log.error( + "Error: {}\n getUrl: {}", + e, + getUrl + ) } finally { if( tarIS != null ) tarIS.close() diff --git a/streamingpro-mlsql/src/main/java/tech/mlsql/tool/TarfileUtil.java b/streamingpro-mlsql/src/main/java/tech/mlsql/tool/TarfileUtil.java index 4d04c2207..520327daa 100644 --- a/streamingpro-mlsql/src/main/java/tech/mlsql/tool/TarfileUtil.java +++ b/streamingpro-mlsql/src/main/java/tech/mlsql/tool/TarfileUtil.java @@ -1,11 +1,12 @@ package tech.mlsql.tool; +import net.csdn.common.logging.CSLogger; +import net.csdn.common.logging.Loggers; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.log4j.Logger; import org.kamranzafar.jtar.TarEntry; import org.kamranzafar.jtar.TarInputStream; import org.kamranzafar.jtar.TarOutputStream; @@ -19,7 +20,7 @@ * 24/5/2021 WilliamZhu(allwefantasy@gmail.com) */ public class TarfileUtil { - private static Logger logger = Logger.getLogger(TarfileUtil.class); + private static CSLogger logger = Loggers.getLogger(TarfileUtil.class); public static void walk(FileSystem fs, List files, Path p) throws IOException { if (fs.isFile(p)) { @@ -87,15 +88,11 @@ public static int createTarFileStream(OutputStream output, String pathStr) throw } else return 400; } catch (Exception e) { - if (logger.isDebugEnabled()) { - logger.debug( - String.format( - "createTarFileStream Error!!!\n pathStr: %s \n exception: %s", - pathStr, - e - ) - ); - } + logger.error( + "Error!!!\n pathStr: {} \n exception: {}", + pathStr, + e + ); return 500; } diff --git a/streamingpro-spark-common/src/main/java/streaming/core/DownloadRunner.java b/streamingpro-spark-common/src/main/java/streaming/core/DownloadRunner.java index bdc61360b..4e5eb37da 100644 --- a/streamingpro-spark-common/src/main/java/streaming/core/DownloadRunner.java +++ b/streamingpro-spark-common/src/main/java/streaming/core/DownloadRunner.java @@ -18,12 +18,13 @@ package streaming.core; +import net.csdn.common.logging.CSLogger; +import net.csdn.common.logging.Loggers; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.log4j.Logger; import org.kamranzafar.jtar.TarOutputStream; import javax.servlet.http.HttpServletResponse; @@ -38,7 +39,7 @@ */ public class DownloadRunner { - private static Logger logger = Logger.getLogger(DownloadRunner.class); + private static CSLogger logger = Loggers.getLogger(DownloadRunner.class); public static int createTarFileStream(OutputStream output, String pathStr) { String[] paths = pathStr.split(","); @@ -89,9 +90,7 @@ public static int createTarFileStream(OutputStream output, String pathStr) { } else return 400; } catch (Exception e) { - if (logger.isDebugEnabled()) { - logger.debug(String.format("createTarFileStream Error!!!\n pathStr: %s \n exception: %s", pathStr, e)); - } + logger.error("Error!!!\n pathStr: {} \n exception: {}", pathStr, e); return 500; } @@ -101,9 +100,7 @@ public static int getTarFileByPath(HttpServletResponse res, String pathStr) { try { return createTarFileStream(res.getOutputStream(), pathStr); } catch (IOException e) { - if (logger.isDebugEnabled()) { - logger.debug(String.format("getTarFileByPath Error!!!\n res: %s \n pathStr: %s \n exception: %s", res, pathStr, e)); - } + logger.error("Error!!!\n res: {} \n pathStr: {} \n exception: {}", res, pathStr, e); return 500; } } @@ -182,9 +179,7 @@ public static int getRawFileByPath(HttpServletResponse res, String path, long po } catch (Exception e) { - if (logger.isDebugEnabled()) { - logger.debug(String.format("getRawFileByPath Error!!!\n res: %s \n path: %s \n position: %s \n exception: %s", res, path, position, e)); - } + logger.error("Error!!!\n res: {} \n path: {} \n position: {} \n exception: {}", res, path, position, e); } return 500;