From 6947721eb54c24c719b35e89033915e2fff9ea49 Mon Sep 17 00:00:00 2001
From: Yevhen Zozulia <y.zozulia@surc.local>
Date: Tue, 22 Aug 2017 16:33:20 +0300
Subject: [PATCH] [SECIOTSRK-463] Restore new structure server MQ

---
 servermq/configuration/develop/iotivity.properties |  2 +-
 servermq/configuration/srk/iotivity.properties     |  2 +-
 servers/mq/configuration/amazon/jdbc.properties    |  2 +-
 servers/mq/configuration/amazon/logback.xml        | 36 +++++++++----
 servers/mq/configuration/develop/jdbc.properties   |  2 +-
 servers/mq/configuration/develop/logback.xml       | 30 +++++++----
 servers/mq/configuration/srk/jdbc.properties       |  2 +-
 servers/mq/configuration/srk/logback.xml           | 32 +++++++----
 servers/mq/pom.xml                                 | 47 ++++++++++------
 servers/mq/src/main/resources/logback.xml          | 62 ++++++++++++++++++++++
 servers/pom.xml                                    |  2 +-
 11 files changed, 167 insertions(+), 52 deletions(-)
 create mode 100644 servers/mq/src/main/resources/logback.xml

diff --git a/servermq/configuration/develop/iotivity.properties b/servermq/configuration/develop/iotivity.properties
index 5e8bff0..785ab4b 100644
--- a/servermq/configuration/develop/iotivity.properties
+++ b/servermq/configuration/develop/iotivity.properties
@@ -1,3 +1,3 @@
-iotivity.listener_delay=5000
+iotivity.listener_delay=500
 iotivity.kafka_host=106.125.46.44:9092
 iotivity.zookeper_host=106.125.46.44:2181
\ No newline at end of file
diff --git a/servermq/configuration/srk/iotivity.properties b/servermq/configuration/srk/iotivity.properties
index 5e8bff0..785ab4b 100644
--- a/servermq/configuration/srk/iotivity.properties
+++ b/servermq/configuration/srk/iotivity.properties
@@ -1,3 +1,3 @@
-iotivity.listener_delay=5000
+iotivity.listener_delay=500
 iotivity.kafka_host=106.125.46.44:9092
 iotivity.zookeper_host=106.125.46.44:2181
\ No newline at end of file
diff --git a/servers/mq/configuration/amazon/jdbc.properties b/servers/mq/configuration/amazon/jdbc.properties
index 0f30b40..a38a26c 100644
--- a/servers/mq/configuration/amazon/jdbc.properties
+++ b/servers/mq/configuration/amazon/jdbc.properties
@@ -4,7 +4,7 @@ jdbc.username=postgres
 jdbc.password=wfgkfgr393Jevo
 
 hibernate.dialect=org.hibernate.dialect.PostgreSQL82Dialect
-hibernate.show_sql=true
+hibernate.show_sql=false
 hibernate.hbm2ddl.auto=update
 hibernate.hbm2ddl.import_files=sql/init.sql
 hibernate.temp.use_jdbc_metadata_defaults=false
diff --git a/servers/mq/configuration/amazon/logback.xml b/servers/mq/configuration/amazon/logback.xml
index 8adedb0..18f3eb1 100644
--- a/servers/mq/configuration/amazon/logback.xml
+++ b/servers/mq/configuration/amazon/logback.xml
@@ -2,28 +2,25 @@
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
             <Pattern>
-                [%d{yyyy-MM-dd HH:mm:ss}] [%-5p] - %m%n
+                [%d{yyyy-MM-dd HH:mm:ss}] [%-5p] [%t] %c{1}:[%L] - %m%n
             </Pattern>
         </layout>
     </appender>
 
     <appender name="FILE-ENGINE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/tmp/log/mqserver.log</file>
+        <file>/tmp/servers/mqserver.log</file>
         <encoder>
             <Pattern>
-                [%d{yyyy-MM-dd HH:mm:ss}] [%-5p] - %m%n
+                [%d{yyyy-MM-dd HH:mm:ss}] [%-5p] [%t] %c{1}:[%L] - %m%n
             </Pattern>
         </encoder>
 
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <FileNamePattern>/tmp/log/mqserver.%i.log</FileNamePattern>
-            <MinIndex>1</MinIndex>
-            <MaxIndex>10</MaxIndex>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>/tmp/servers/mqserver-%d{yyyy-MM-dd-HH-mm}.%i.log</fileNamePattern>
+            <maxFileSize>100MB</maxFileSize>
+            <!-- <maxHistory>30</maxHistory> -->
+            <totalSizeCap>1GB</totalSizeCap>
         </rollingPolicy>
-
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
     </appender>
 
     <logger name="com.samsung" level="info" additivity="false">
@@ -32,10 +29,27 @@
     </logger>
 
     <logger name="org.springframework" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE-ENGINE" />
     </logger>
 
     <logger name="org.hibernate" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <logger name="kafka" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <logger name="org.apache.zookeeper" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <logger name="org.I0Itec.zkclient" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE-ENGINE" />
     </logger>
 
diff --git a/servers/mq/configuration/develop/jdbc.properties b/servers/mq/configuration/develop/jdbc.properties
index 1547bc3..b8b1752 100644
--- a/servers/mq/configuration/develop/jdbc.properties
+++ b/servers/mq/configuration/develop/jdbc.properties
@@ -4,7 +4,7 @@ jdbc.username=postgres
 jdbc.password=postgres
 
 hibernate.dialect=org.hibernate.dialect.PostgreSQL82Dialect
-hibernate.show_sql=true
+hibernate.show_sql=false
 hibernate.hbm2ddl.auto=update
 hibernate.hbm2ddl.import_files=sql/init.sql
 hibernate.temp.use_jdbc_metadata_defaults=false
diff --git a/servers/mq/configuration/develop/logback.xml b/servers/mq/configuration/develop/logback.xml
index 0be0a16..b798c31 100644
--- a/servers/mq/configuration/develop/logback.xml
+++ b/servers/mq/configuration/develop/logback.xml
@@ -8,22 +8,19 @@
     </appender>
 
     <appender name="FILE-ENGINE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/tmp/log/mqserver.log</file>
+        <file>/tmp/servers/mqserver.log</file>
         <encoder>
             <Pattern>
                 [%d{yyyy-MM-dd HH:mm:ss}] [%-5p] [%t] %c{1}:[%L] - %m%n
             </Pattern>
         </encoder>
 
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <FileNamePattern>/tmp/log/mqserver.%i.log</FileNamePattern>
-            <MinIndex>1</MinIndex>
-            <MaxIndex>10</MaxIndex>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>/tmp/servers/mqserver-%d{yyyy-MM-dd-HH-mm}.%i.log</fileNamePattern>
+            <maxFileSize>100MB</maxFileSize>
+            <!-- <maxHistory>30</maxHistory> -->
+            <totalSizeCap>1GB</totalSizeCap>
         </rollingPolicy>
-
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
     </appender>
 
     <logger name="com.samsung" level="debug" additivity="false">
@@ -41,6 +38,21 @@
         <appender-ref ref="FILE-ENGINE" />
     </logger>
 
+    <logger name="kafka" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <logger name="org.apache.zookeeper" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <logger name="org.I0Itec.zkclient" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
     <root level="error">
         <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE-ENGINE" />
diff --git a/servers/mq/configuration/srk/jdbc.properties b/servers/mq/configuration/srk/jdbc.properties
index 1547bc3..b8b1752 100644
--- a/servers/mq/configuration/srk/jdbc.properties
+++ b/servers/mq/configuration/srk/jdbc.properties
@@ -4,7 +4,7 @@ jdbc.username=postgres
 jdbc.password=postgres
 
 hibernate.dialect=org.hibernate.dialect.PostgreSQL82Dialect
-hibernate.show_sql=true
+hibernate.show_sql=false
 hibernate.hbm2ddl.auto=update
 hibernate.hbm2ddl.import_files=sql/init.sql
 hibernate.temp.use_jdbc_metadata_defaults=false
diff --git a/servers/mq/configuration/srk/logback.xml b/servers/mq/configuration/srk/logback.xml
index b089676..b798c31 100644
--- a/servers/mq/configuration/srk/logback.xml
+++ b/servers/mq/configuration/srk/logback.xml
@@ -2,28 +2,25 @@
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
             <Pattern>
-                [%d{yyyy-MM-dd HH:mm:ss}] [%-5p] - %m%n
+                [%d{yyyy-MM-dd HH:mm:ss}] [%-5p] [%t] %c{1}:[%L] - %m%n
             </Pattern>
         </layout>
     </appender>
 
     <appender name="FILE-ENGINE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/tmp/log/mqserver.log</file>
+        <file>/tmp/servers/mqserver.log</file>
         <encoder>
             <Pattern>
                 [%d{yyyy-MM-dd HH:mm:ss}] [%-5p] [%t] %c{1}:[%L] - %m%n
             </Pattern>
         </encoder>
 
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <FileNamePattern>/tmp/log/mqserver.%i.log</FileNamePattern>
-            <MinIndex>1</MinIndex>
-            <MaxIndex>10</MaxIndex>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>/tmp/servers/mqserver-%d{yyyy-MM-dd-HH-mm}.%i.log</fileNamePattern>
+            <maxFileSize>100MB</maxFileSize>
+            <!-- <maxHistory>30</maxHistory> -->
+            <totalSizeCap>1GB</totalSizeCap>
         </rollingPolicy>
-
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
     </appender>
 
     <logger name="com.samsung" level="debug" additivity="false">
@@ -41,6 +38,21 @@
         <appender-ref ref="FILE-ENGINE" />
     </logger>
 
+    <logger name="kafka" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <logger name="org.apache.zookeeper" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <logger name="org.I0Itec.zkclient" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
     <root level="error">
         <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE-ENGINE" />
diff --git a/servers/mq/pom.xml b/servers/mq/pom.xml
index 29e2b6f..eea9053 100644
--- a/servers/mq/pom.xml
+++ b/servers/mq/pom.xml
@@ -53,6 +53,14 @@
                     </groupId>
                     <artifactId>spring-security-oauth2</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -65,24 +73,22 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-            </exclusions>
+            
         </dependency>
 
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-taglibs</artifactId>
-            <version>${spring-security-version}</version>
         </dependency>
 
         <dependency>
@@ -93,43 +99,41 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
-            <version>${spring-data-jpa.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-aop</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-expression</artifactId>
-            <version>${spring.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-orm</artifactId>
-            <version>${spring.version}</version>
         </dependency>
 
         <dependency>
@@ -162,7 +166,12 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-commons</artifactId>
-            <version>${spring-data-commons.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -179,13 +188,20 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
         </dependency>
 
         <dependency>
@@ -231,7 +247,6 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${dbh2.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/servers/mq/src/main/resources/logback.xml b/servers/mq/src/main/resources/logback.xml
new file mode 100644
index 0000000..b798c31
--- /dev/null
+++ b/servers/mq/src/main/resources/logback.xml
@@ -0,0 +1,62 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>
+                [%d{yyyy-MM-dd HH:mm:ss}] [%-5p] [%t] %c{1}:[%L] - %m%n
+            </Pattern>
+        </layout>
+    </appender>
+
+    <appender name="FILE-ENGINE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>/tmp/servers/mqserver.log</file>
+        <encoder>
+            <Pattern>
+                [%d{yyyy-MM-dd HH:mm:ss}] [%-5p] [%t] %c{1}:[%L] - %m%n
+            </Pattern>
+        </encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>/tmp/servers/mqserver-%d{yyyy-MM-dd-HH-mm}.%i.log</fileNamePattern>
+            <maxFileSize>100MB</maxFileSize>
+            <!-- <maxHistory>30</maxHistory> -->
+            <totalSizeCap>1GB</totalSizeCap>
+        </rollingPolicy>
+    </appender>
+
+    <logger name="com.samsung" level="debug" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <logger name="org.springframework" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <logger name="org.hibernate" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <logger name="kafka" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <logger name="org.apache.zookeeper" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <logger name="org.I0Itec.zkclient" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </logger>
+
+    <root level="error">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE-ENGINE" />
+    </root>
+
+    <jmxConfigurator />
+</configuration>
\ No newline at end of file
diff --git a/servers/pom.xml b/servers/pom.xml
index f366d50..708e972 100644
--- a/servers/pom.xml
+++ b/servers/pom.xml
@@ -15,7 +15,7 @@
     <modules>
         <module>commons</module>
         <module>dsm</module>
-        <!-- <module>mq</module> -->
+        <module>mq</module>
     </modules>
 
     <properties>
-- 
2.7.4