[assembly] Don't omit IgnoreSiftAppender in dev-launcher

This reverts 2639b9b
daisy · Feb 14, 2018 · 2467bd7 · 2467bd7
1 parent 4e7758a
commit 2467bd7
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/assembly/src/main/assembly/dev.properties b/assembly/src/main/assembly/dev.properties
@@ -4,4 +4,3 @@ bundles.auto.deploy=../bundles/felix
 bundles.bootstrap=../bundles/bootstrap
 pipeline.ws.clientkey=clientid
 pipeline.ws.clientsecret=supersecret
-pipeline.log.jobappender=ch.qos.logback.classic.sift.SiftingAppender
diff --git a/assembly/src/main/assembly/dev.xml b/assembly/src/main/assembly/dev.xml
@@ -39,9 +39,6 @@
         <include>gui/org.apache.felix.fileinstall-*.cfg</include>
         <include>webservice/org.apache.felix.fileinstall-*.cfg</include>
       </includes>
-      <excludes>
-        <exclude>org.apache.felix.fileinstall-pipeline-logging-appender.cfg</exclude>
-      </excludes>
       <outputDirectory>/etc</outputDirectory>
       <filtered>true</filtered>
     </fileSet>

diff --git a/assembly/src/main/assembly/dist.properties b/assembly/src/main/assembly/dist.properties
@@ -16,4 +16,3 @@ pipeline.ws.clientsecret=supersecret
 pipeline.cli.starting=true
 pipeline.cli.timeout=100
 pipeline.cli.debug=false
-pipeline.log.jobappender=org.daisy.pipeline.logging.IgnoreSiftAppender
diff --git a/assembly/src/main/resources/etc/config-logback.xml b/assembly/src/main/resources/etc/config-logback.xml
@@ -2,7 +2,8 @@
 
   <!-- see http://logback.qos.ch/manual/configuration.html#LevelChangePropagator -->
   <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
-    <appender name="JOB" class="${pipeline.log.jobappender}">
+
+  <appender name="JOB" class="org.daisy.pipeline.logging.IgnoreSiftAppender">
     <!-- in the absence of the class attribute, it is assumed that the
          desired discriminator type is
          ch.qos.logback.classic.sift.MDCBasedDiscriminator -->