Cleanup logging

Consonance · Oct 28, 2016 · a71684c · a71684c
1 parent f0c1cdd
commit a71684c
Show file tree

Hide file tree

Showing 9 changed files with 110 additions and 10 deletions.
diff --git a/consonance-arch/pom.xml b/consonance-arch/pom.xml
@@ -123,10 +123,6 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
@@ -307,6 +303,11 @@
             <artifactId>commons-vfs2</artifactId>
             <version>2.0</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -317,6 +318,7 @@
                     <usedDependencies>
                         <usedDependency>org.apache.commons:commons-pool2</usedDependency>
                         <usedDependency>org.apache.commons:commons-vfs2</usedDependency>
+                        <usedDependency>ch.qos.logback:logback-classic</usedDependency>
                     </usedDependencies>
                 </configuration>
             </plugin>
@@ -329,7 +331,6 @@
                         <filter>
                             <artifact>*:*</artifact>
                             <excludes>
-                                <exclude>logback.xml</exclude>
                                 <exclude>META-INF/*.SF</exclude>
                                 <exclude>META-INF/*.DSA</exclude>
                                 <exclude>META-INF/*.RSA</exclude>

diff --git a/consonance-arch/src/main/resources/logback.xml b/consonance-arch/src/main/resources/logback.xml
@@ -0,0 +1,36 @@
+<!--
+  ~     Consonance - workflow software for multiple clouds
+  ~     Copyright (C) 2016 OICR
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  ~
+  -->
+
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+        ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/consonance-client/pom.xml b/consonance-client/pom.xml
@@ -166,6 +166,11 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -223,6 +228,7 @@
                                 <usedDependency>joda-time:joda-time</usedDependency>
                                 <!-- needed as part of excluding gson 2.7 from dependency since it breaks jclouds -->
                                 <usedDependency>com.google.code.gson:gson</usedDependency>
+                                <usedDependency>ch.qos.logback:logback-classic</usedDependency>
                             </usedDependencies>
                         </configuration>
                     </execution>

diff --git a/consonance-client/src/main/resources/logback.xml b/consonance-client/src/main/resources/logback.xml
@@ -0,0 +1,36 @@
+<!--
+  ~     Consonance - workflow software for multiple clouds
+  ~     Copyright (C) 2016 OICR
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  ~
+  -->
+
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+        ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/consonance-common/pom.xml b/consonance-common/pom.xml
@@ -89,6 +89,16 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/logback.xml</exclude>
+                        <exclude>**/logback-test.xml</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/consonance-server-common/pom.xml b/consonance-server-common/pom.xml
@@ -176,6 +176,16 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/logback.xml</exclude>
+                        <exclude>**/logback-test.xml</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/container-admin/config.template b/container-admin/config.template
@@ -22,4 +22,4 @@ check_previous_job_hash = false
 [provision]
 max_running_containers = 5
 youxia_deployer_parameters = --max-spot-price 0.01 --batch-size 1 --total-nodes-num 1 --ansible-playbook /container-host-bag/install.yml  -e /container-host-bag/example_params.json --server-tag-file /container-host-bag/example_tags.json
-youxia_reaper_parameters = --test
+youxia_reaper_parameters =
diff --git a/container-admin/docker-compose.yml b/container-admin/docker-compose.yml
@@ -55,6 +55,11 @@ services:
       - provisioner
     volumes:
       - log_volume:/consonance_logs
+    environment:
+      - PGHOST=postgres
+      - PGUSER=postgres
+      - PGPASSWORD=postgres
+      - PGDATABASE=postgres
 
 volumes:
   log_volume: 
diff --git a/pom.xml b/pom.xml
@@ -765,10 +765,6 @@
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>3.0.2</version>
                     <configuration>
-                        <excludes>
-                            <exclude>**/logback.xml</exclude>
-                            <exclude>**/logback-test.xml</exclude>
-                        </excludes>
                         <archive>
                             <manifest>
                                 <addDefaultImplementationEntries>true</addDefaultImplementationEntries>