You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by xi...@apache.org on 2020/05/25 23:36:33 UTC

[incubator-pinot] branch enhance_log4j created (now 236ab23)

This is an automated email from the ASF dual-hosted git repository.

xiangfu pushed a change to branch enhance_log4j
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.


      at 236ab23  Update Pinot-admin and quickstart log4j config

This branch includes the following new commits:

     new 236ab23  Update Pinot-admin and quickstart log4j config

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org


[incubator-pinot] 01/01: Update Pinot-admin and quickstart log4j config

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiangfu pushed a commit to branch enhance_log4j
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git

commit 236ab2305f39a41047ebb0b932f70a0418e85f6c
Author: Xiang Fu <fx...@gmail.com>
AuthorDate: Mon May 25 16:34:59 2020 -0700

    Update Pinot-admin and quickstart log4j config
---
 .../src/main/resources/conf/pinot-admin-log4j2.xml | 37 +++++--------
 .../src/main/resources/conf/quickstart-log4j2.xml  | 64 ++++++----------------
 2 files changed, 32 insertions(+), 69 deletions(-)

diff --git a/pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml b/pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml
index a7d7b3c..bca2014 100644
--- a/pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml
+++ b/pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml
@@ -20,37 +20,30 @@
 
 -->
 <Configuration>
+
+  <Properties>
+    <Property name="LOG_ROOT">logs</Property>
+    <Property name="LOG_PATTERN">%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</Property>
+  </Properties>
   <Appenders>
     <Console name="console" target="SYSTEM_OUT" />
-    <RandomAccessFile name="controllerLog" fileName="pinotController.log" immediateFlush="false">
-      <PatternLayout>
-        <Pattern>%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</Pattern>
-      </PatternLayout>
-    </RandomAccessFile>
-    <RandomAccessFile name="brokerLog" fileName="pinotBroker.log" immediateFlush="false">
-      <PatternLayout>
-        <Pattern>%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</Pattern>
-      </PatternLayout>
-    </RandomAccessFile>
-    <RandomAccessFile name="serverLog" fileName="pinotServer.log" immediateFlush="false">
-      <PatternLayout>
-        <Pattern>%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</Pattern>
-      </PatternLayout>
-    </RandomAccessFile>
+    <RollingFile name="pinotLog" fileName="${env:LOG_ROOT}/pinot.log"
+                 filePattern="${env:LOG_ROOT}/pinot-%d{yyyy-MM-dd}-%i.log" immediateFlush="false">
+      <PatternLayout pattern="${env:LOG_PATTERN}"/>
+      <Policies>
+        <SizeBasedTriggeringPolicy size="19500KB" />
+      </Policies>
+      <DefaultRolloverStrategy max="10"/>
+    </RollingFile>
   </Appenders>
   <Loggers>
     <Root level="info" additivity="false">
-      <AppenderRef ref="console"/>
+      <AppenderRef ref="pinotLog"/>
+      <AppenderRef ref="console" level="warn"/>
     </Root>
-    <Logger name="org.apache.pinot.controller.ControllerStarter" level="info" additivity="false">
-      <AppenderRef ref="console"/>
-    </Logger>
     <Logger name="org.apache.pinot.tools.admin" level="info" additivity="false">
       <AppenderRef ref="console"/>
     </Logger>
     <AsyncLogger name="org.reflections" level="error" additivity="false"/>
-    <AsyncLogger name="org.apache.pinot.spi.plugin" level="error" additivity="false">
-      <AppenderRef ref="console"/>
-    </AsyncLogger>
   </Loggers>
 </Configuration>
diff --git a/pinot-tools/src/main/resources/conf/quickstart-log4j2.xml b/pinot-tools/src/main/resources/conf/quickstart-log4j2.xml
index e80ff2a..d9ba216 100644
--- a/pinot-tools/src/main/resources/conf/quickstart-log4j2.xml
+++ b/pinot-tools/src/main/resources/conf/quickstart-log4j2.xml
@@ -20,60 +20,30 @@
 
 -->
 <Configuration>
-  <Appenders>
-    <Console name="console" target="SYSTEM_OUT"/>
-    <RandomAccessFile name="controllerLog" fileName="pinotController.log" immediateFlush="false">
-      <PatternLayout>
-        <Pattern>%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</Pattern>
-      </PatternLayout>
-    </RandomAccessFile>
-    <RandomAccessFile name="brokerLog" fileName="pinotBroker.log" immediateFlush="false">
-      <PatternLayout>
-        <Pattern>%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</Pattern>
-      </PatternLayout>
-    </RandomAccessFile>
-    <RandomAccessFile name="serverLog" fileName="pinotServer.log" immediateFlush="false">
-      <PatternLayout>
-        <Pattern>%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</Pattern>
-      </PatternLayout>
-    </RandomAccessFile>
 
+  <Properties>
+    <Property name="LOG_ROOT">logs</Property>
+    <Property name="LOG_PATTERN">%d{yyyy/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n</Property>
+  </Properties>
+  <Appenders>
+    <Console name="console" target="SYSTEM_OUT" />
+    <RollingFile name="pinotLog" fileName="${env:LOG_ROOT}/pinot.log"
+                 filePattern="${env:LOG_ROOT}/pinot-%d{yyyy-MM-dd}-%i.log" immediateFlush="false">
+      <PatternLayout pattern="${env:LOG_PATTERN}"/>
+      <Policies>
+        <SizeBasedTriggeringPolicy size="19500KB" />
+      </Policies>
+      <DefaultRolloverStrategy max="10"/>
+    </RollingFile>
   </Appenders>
   <Loggers>
-    <Root level="error" additivity="false">
-      <AppenderRef ref="console"/>
+    <Root level="info" additivity="false">
+      <AppenderRef ref="pinotLog"/>
+      <AppenderRef ref="console" level="error"/>
     </Root>
-    <Logger name="org.apache.pinot" level="error" additivity="false"/>
     <Logger name="org.apache.pinot.tools.admin" level="info" additivity="false">
       <AppenderRef ref="console"/>
     </Logger>
-
-    <!-- Direct controller package log to the controller log file -->
-    <AsyncLogger name="org.apache.pinot.controller" level="info" additivity="false">
-      <AppenderRef ref="controllerLog"/>
-    </AsyncLogger>
-
-    <!-- Direct broker package log to the broker log file -->
-    <AsyncLogger name="org.apache.pinot.broker" level="info" additivity="false">
-      <AppenderRef ref="brokerLog"/>
-    </AsyncLogger>
-
-    <!-- Including server related package log to the server log file -->
-    <AsyncLogger name="org.apache.pinot.server" level="info" additivity="false">
-      <AppenderRef ref="serverLog"/>
-    </AsyncLogger>
-    <AsyncLogger name="org.apache.pinot.core.plan" level="info" additivity="false">
-      <AppenderRef ref="serverLog"/>
-    </AsyncLogger>
-    <AsyncLogger name="org.apache.pinot.core.realtime" level="info" additivity="false">
-      <AppenderRef ref="serverLog"/>
-    </AsyncLogger>
-    <AsyncLogger name="org.apache.pinot.core.query" level="info" additivity="false">
-      <AppenderRef ref="serverLog"/>
-    </AsyncLogger>
     <AsyncLogger name="org.reflections" level="error" additivity="false"/>
-    <AsyncLogger name="org.apache.pinot.spi.plugin" level="error" additivity="false">
-      <AppenderRef ref="console"/>
-    </AsyncLogger>
   </Loggers>
 </Configuration>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org