From c842a4fa72302e8a10b414af53a9f0e449160dba Mon Sep 17 00:00:00 2001
From: pahnjy <pahnjy@daum.net>
Date: Mon, 9 Jan 2017 19:47:15 +0900
Subject: [PATCH] =?UTF-8?q?Log=20=EC=88=98=EC=A0=95=20#320?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../so/device/logic/DeviceManagerLogic.java   |  2 +-
 so-web/src/main/resources/logback-spring.xml  | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/so-device/src/main/java/com/pineone/icbms/so/device/logic/DeviceManagerLogic.java b/so-device/src/main/java/com/pineone/icbms/so/device/logic/DeviceManagerLogic.java
index 4e34f112..e0368470 100644
--- a/so-device/src/main/java/com/pineone/icbms/so/device/logic/DeviceManagerLogic.java
+++ b/so-device/src/main/java/com/pineone/icbms/so/device/logic/DeviceManagerLogic.java
@@ -131,7 +131,7 @@ public String deviceExecute(String deviceId,String deviceCommand, String session
         /**
          * Device 제어 후 제어 결과가 Success면 Device Subscription 요청
          */
-        if(resultMessage.getCode().equals(ClientProfile.RESPONSE_SUCCESS_ONEM2MCODE) && false) {
+        if(resultMessage.getCode().equals(ClientProfile.RESPONSE_SUCCESS_ONEM2MCODE)) {
             String subscriptionUri = device.getDeviceUri() + (ClientProfile.actionDeviceCommand(device.getDeviceUri()) ? ClientProfile.SI_CONTAINER_ACTION : ClientProfile.SI_CONTAINER_POWER) + ClientProfile.SI_CONTAINER_STATUS;
             String response = deviceSubscription(subscriptionUri, deviceControlMessage.get_commandId());
             logger.debug(LogPrint.LogMethodNamePrint() + " | Device Subscription : " + " , Device Uri = " + device.getDeviceUri() + " , Result : " + response + " , Session ID = " + sessionId);
diff --git a/so-web/src/main/resources/logback-spring.xml b/so-web/src/main/resources/logback-spring.xml
index 6756a7ae..66989f29 100644
--- a/so-web/src/main/resources/logback-spring.xml
+++ b/so-web/src/main/resources/logback-spring.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml" />
+    <!-- ConsoleAppender Example -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <pattern>%msg %n</pattern>
-        </layout>
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>[%d{yyyy-MM-dd HHmmss.SSS}] [%5level] [%16.16thread{15}] [%-35logger{35}] : %msg %n</pattern>
+            <!-- <pattern>%d{ISO8601} %5level [%15thread] %-35logger{35} : %msg %n</pattern> -->
+        </encoder>
     </appender>
 
     <!-- RollingFileAppender Example -->
     <appender name="ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>so-log.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- rollover daily -->SOLogger
+            <!-- rollover daily -->
             <fileNamePattern>so-log-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy
                     class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
@@ -19,15 +24,10 @@
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
         <encoder>
-            <pattern>%msg %n</pattern>
+            <pattern>[%d{yyyy-MM-dd HHmmss.SSS}] [%5level] [%16.16thread{15}] [%-35logger{35}] : %msg %n</pattern>
         </encoder>
     </appender>
-
-
     <logger name="com.pineone.icbms.so" level="DEBUG">
         <appender-ref ref="ROLLING" />
     </logger>
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
 </configuration>
\ No newline at end of file