Starting logback after logging-appender solves some issues in dev-lau…

…ncher EDIT: this was only a coincidence, see #104 (comment)
daisy · Jun 21, 2016 · fb14827 · fb14827
1 parent 88a19ee
commit fb14827
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -146,16 +146,6 @@
             <configuration>
               <outputDirectory>${project.build.directory}/bundles/felix</outputDirectory>
               <artifactItems>
-                <artifactItem>
-                  <groupId>ch.qos.logback</groupId>
-                  <artifactId>logback-classic</artifactId>
-                  <version>1.0.11</version>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>ch.qos.logback</groupId>
-                  <artifactId>logback-core</artifactId>
-                  <version>1.0.11</version>
-                </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.felix</groupId>
                   <artifactId>org.apache.felix.gogo.command</artifactId>
@@ -587,6 +577,19 @@
                   <groupId>org.daisy.pipeline</groupId>
                   <artifactId>xproc-api</artifactId>
                 </artifactItem>
+                <!--
+                    logback not started before logging-appender
+                -->
+                <artifactItem>
+                  <groupId>ch.qos.logback</groupId>
+                  <artifactId>logback-classic</artifactId>
+                  <version>1.0.11</version>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>ch.qos.logback</groupId>
+                  <artifactId>logback-core</artifactId>
+                  <version>1.0.11</version>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -1487,7 +1490,6 @@
         <pipeline.ws.clientsecret>supersecret</pipeline.ws.clientsecret>
         <pipeline.cli.exec_line>/dev/null</pipeline.cli.exec_line>
         <pipeline.cli.starting>false</pipeline.cli.starting>
-        <pipeline.log.jobappender>org.daisy.pipeline.logging.IgnoreSiftAppender</pipeline.log.jobappender>
       </properties>
       <build>
         <plugins>

diff --git a/src/main/assembly/dev.properties b/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/src/main/assembly/dev.xml b/src/main/assembly/dev.xml
@@ -34,9 +34,6 @@
       <includes>
         <include>org.apache.felix.fileinstall-*.cfg</include>
       </includes>
-      <excludes>
-        <exclude>org.apache.felix.fileinstall-o.d.p.logging-appender.cfg</exclude>
-      </excludes>
       <outputDirectory>/etc</outputDirectory>
       <filtered>true</filtered>
     </fileSet>

diff --git a/src/main/assembly/dist.properties b/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/src/main/resources/etc/config-logback.xml b/src/main/resources/etc/config-logback.xml
@@ -2,7 +2,7 @@
 
   <!-- 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 -->