diff --git a/consonance-arch/pom.xml b/consonance-arch/pom.xml index dc133aa..f4b6935 100644 --- a/consonance-arch/pom.xml +++ b/consonance-arch/pom.xml @@ -123,10 +123,6 @@ ch.qos.logback logback-core - - ch.qos.logback - logback-classic - org.apache.httpcomponents httpcore @@ -307,6 +303,11 @@ commons-vfs2 2.0 + + ch.qos.logback + logback-classic + true + @@ -317,6 +318,7 @@ org.apache.commons:commons-pool2 org.apache.commons:commons-vfs2 + ch.qos.logback:logback-classic @@ -329,7 +331,6 @@ *:* - logback.xml META-INF/*.SF META-INF/*.DSA META-INF/*.RSA diff --git a/consonance-arch/src/main/resources/logback.xml b/consonance-arch/src/main/resources/logback.xml new file mode 100644 index 0000000..8badd37 --- /dev/null +++ b/consonance-arch/src/main/resources/logback.xml @@ -0,0 +1,36 @@ + + + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + WARN + + + + + + + diff --git a/consonance-client/pom.xml b/consonance-client/pom.xml index 69768a6..bd85a2f 100644 --- a/consonance-client/pom.xml +++ b/consonance-client/pom.xml @@ -166,6 +166,11 @@ com.google.code.gson gson + + ch.qos.logback + logback-classic + true + @@ -223,6 +228,7 @@ joda-time:joda-time com.google.code.gson:gson + ch.qos.logback:logback-classic diff --git a/consonance-client/src/main/resources/logback.xml b/consonance-client/src/main/resources/logback.xml new file mode 100644 index 0000000..8badd37 --- /dev/null +++ b/consonance-client/src/main/resources/logback.xml @@ -0,0 +1,36 @@ + + + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + WARN + + + + + + + diff --git a/consonance-common/pom.xml b/consonance-common/pom.xml index d328ee0..b7f12c6 100644 --- a/consonance-common/pom.xml +++ b/consonance-common/pom.xml @@ -89,6 +89,16 @@ org.apache.maven.plugins maven-compiler-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + **/logback.xml + **/logback-test.xml + + + diff --git a/consonance-server-common/pom.xml b/consonance-server-common/pom.xml index 1c7582c..d85163f 100644 --- a/consonance-server-common/pom.xml +++ b/consonance-server-common/pom.xml @@ -176,6 +176,16 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + **/logback.xml + **/logback-test.xml + + + diff --git a/container-admin/config.template b/container-admin/config.template index 861463b..f12e2ac 100644 --- 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 index 1512d8c..b74e723 100644 --- 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 index f535461..dff1888 100644 --- a/pom.xml +++ b/pom.xml @@ -765,10 +765,6 @@ maven-jar-plugin 3.0.2 - - **/logback.xml - **/logback-test.xml - true