Merge pull request #63 from Nexters/fix/62-limit-discord-notification

fix: 디스코드 알림 유형 제한

Author: 1117mg

docker-compose.dev.yaml

@@ -35,8 +35,8 @@ services:
       - KAKAO_CLIENT_ID=${KAKAO_CLIENT_ID}
       - KAKAO_CLIENT_SECRET=${KAKAO_CLIENT_SECRET}
       - JWT_SECRET_KEY=${JWT_SECRET_KEY}
-      - OAUTH_AUTHORIZED_REDIRECT_URIS=${OAUTH_AUTHORIZED_REDIRECT_URIS:-http://localhost:5173/oauth2/redirect,https://holdy.kr/oauth2/redirect}
-      - OAUTH_DEFAULT_REDIRECT_URI=${OAUTH_DEFAULT_REDIRECT_URI:-http://localhost:5173/oauth2/redirect}
+      - OAUTH_AUTHORIZED_REDIRECT_URIS=${OAUTH_AUTHORIZED_REDIRECT_URIS}
+      - OAUTH_DEFAULT_REDIRECT_URI=${OAUTH_DEFAULT_REDIRECT_URI}
       - NCP_ACCESS_KEY=${NCP_ACCESS_KEY}
       - NCP_SECRET_KEY=${NCP_SECRET_KEY}
       - SPRING_PROFILES_ACTIVE=${SPRING_PROFILE_ACTIVE}

docker-compose.prod.yaml

@@ -35,8 +35,8 @@ services:
       - KAKAO_CLIENT_ID=${KAKAO_CLIENT_ID}
       - KAKAO_CLIENT_SECRET=${KAKAO_CLIENT_SECRET}
       - JWT_SECRET_KEY=${JWT_SECRET_KEY}
-      - OAUTH_AUTHORIZED_REDIRECT_URIS=${OAUTH_AUTHORIZED_REDIRECT_URIS:-https://holdy.kr/oauth2/redirect}
-      - OAUTH_DEFAULT_REDIRECT_URI=${OAUTH_DEFAULT_REDIRECT_URI:-https://holdy.kr/oauth2/redirect}
+      - OAUTH_AUTHORIZED_REDIRECT_URIS=${OAUTH_AUTHORIZED_REDIRECT_URIS}
+      - OAUTH_DEFAULT_REDIRECT_URI=${OAUTH_DEFAULT_REDIRECT_URI}
       - NCP_ACCESS_KEY=${NCP_ACCESS_KEY}
       - NCP_SECRET_KEY=${NCP_SECRET_KEY}
       - SPRING_PROFILES_ACTIVE=${SPRING_PROFILE_ACTIVE}

src/main/resources/application.yaml

@@ -67,10 +67,23 @@ app:
 
 logging:
   level:
+    root: INFO
     com.climbup.climbup: DEBUG
-    org.springframework.security: TRACE
+    org.springframework.security: DEBUG
+    org.springframework.web.servlet.resource: WARN
     org.hibernate.SQL: DEBUG
-    root: ERROR
+    org.hibernate.type.descriptor.sql.BasicBinder: WARN
+    org.apache.catalina.core: WARN
+    org.springframework.web.servlet.PageNotFound: WARN
+
+# 운영
+# logging:
+#   level:
+#     root: INFO
+#     com.climbup.climbup: INFO
+#     org.springframework.security: WARN
+#     org.springframework.web.servlet.resource: ERROR
+#     org.hibernate.SQL: WARN
 
 auth:
   nickname:

src/main/resources/logback.xml

@@ -32,6 +32,13 @@
             <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
                 <level>ERROR</level>
             </filter>
+            <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
+                <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
+                    <marker>EXCLUDE_DISCORD</marker>
+                </evaluator>
+                <onMatch>DENY</onMatch>
+                <onMismatch>NEUTRAL</onMismatch>
+            </filter>
         </appender>
 
         <root level="INFO">
@@ -64,6 +71,13 @@
             <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
                 <level>ERROR</level>
             </filter>
+            <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
+                <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
+                    <marker>EXCLUDE_DISCORD</marker>
+                </evaluator>
+                <onMatch>DENY</onMatch>
+                <onMismatch>NEUTRAL</onMismatch>
+            </filter>
         </appender>
 
         <root level="INFO">