Skip to content

Commit

Permalink
#6299 Added logger for each kernel.
Browse files Browse the repository at this point in the history
  • Loading branch information
@michalgce
michalgce committed Nov 24, 2017
1 parent 54b8ed2 commit 856b705
Show file tree
Hide file tree
Showing 12 changed files with 253 additions and 3 deletions.
4 changes: 3 additions & 1 deletion kernel/base/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ dependencies {
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.6'
compile group: 'org.apache.commons', name: 'commons-text', version: '1.1'
compile group: 'org.apache.maven.shared', name: 'maven-invoker', version: '3.0.0'
compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.22'
compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'

compile group: "org.zeromq", name: "jeromq", version: "0.3.5"
compile group: 'org.apache.ivy', name: 'ivy', version: '2.4.0'

Expand Down
44 changes: 44 additions & 0 deletions kernel/base/out/production/resources/PomTemplateMagicCommand.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.twosigma.beakerx</groupId>
<artifactId>magicCommandDownloader</artifactId>
<version>1.0-SNAPSHOT</version>

<repositories>
<repository>
<id>clojureRepo</id>
<url>http://clojars.org/repo</url>
</repository>
</repositories>

<dependencies></dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>validate</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>pathToNotebookJars</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
0 kernel/base/src/main/resources/logback.xml → ...base/out/production/resources/logback.xml
View file
File renamed without changes.
44 changes: 44 additions & 0 deletions kernel/base/out/test/resources/PomTemplateMagicCommand.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.twosigma.beakerx</groupId>
<artifactId>magicCommandDownloader</artifactId>
<version>1.0-SNAPSHOT</version>

<repositories>
<repository>
<id>project-repo</id>
<url>file://${project.basedir}/build/testMvnCache</url>
</repository>
</repositories>

<dependencies></dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>validate</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>pathToNotebookJars</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
1 change: 0 additions & 1 deletion kernel/base/src/main/java/com/twosigma/beakerx/evaluator/BaseEvaluator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.apache.commons.io.FileUtils;

import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collection;
Expand Down
27 changes: 27 additions & 0 deletions kernel/clojure/src/main/resources/logback.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration debug="true">

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%date %-5level [%class{0}.%M:%line] %msg%n</pattern>
</encoder>
</appender>

<appender name="FILE_CLOJURE" class="ch.qos.logback.core.FileAppender">
<encoder>
<pattern>%date %-5level [%class{0}.%M:%line] %msg%n</pattern>
</encoder>
<append>true</append>
<file>../../logs/jupyter-scala-kernel.log</file>
</appender>

<logger name="com.twosigma.beakerx" level="debug">
<appender-ref ref="FILE_CLOJURE" />
<appender-ref ref="STDOUT" />
</logger>

<root level="info">
<appender-ref ref="STDOUT" />
</root>

</configuration>
1 change: 0 additions & 1 deletion kernel/groovy/src/main/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import com.twosigma.beakerx.jvm.threads.CellExecutor;
import com.twosigma.beakerx.kernel.Classpath;
import com.twosigma.beakerx.kernel.EvaluatorParameters;
import com.twosigma.beakerx.kernel.Imports;
import com.twosigma.beakerx.kernel.PathToJar;
import groovy.lang.Binding;
import groovy.lang.GroovyClassLoader;
Expand Down
27 changes: 27 additions & 0 deletions kernel/groovy/src/main/resources/logback.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration debug="true">

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%date %-5level [%class{0}.%M:%line] %msg%n</pattern>
</encoder>
</appender>

<appender name="FILE_GROOVY" class="ch.qos.logback.core.FileAppender">
<encoder>
<pattern>%date %-5level [%class{0}.%M:%line] %msg%n</pattern>
</encoder>
<append>true</append>
<file>../../logs/jupyter-groovy-kernel.log</file>
</appender>

<logger name="com.twosigma.beakerx" level="debug">
<appender-ref ref="FILE_GROOVY" />
<appender-ref ref="STDOUT" />
</logger>

<root level="info">
<appender-ref ref="STDOUT" />
</root>

</configuration>
27 changes: 27 additions & 0 deletions kernel/java/src/main/resources/logback.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration debug="true">

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%date %-5level [%class{0}.%M:%line] %msg%n</pattern>
</encoder>
</appender>

<appender name="FILE_GROOVY" class="ch.qos.logback.core.FileAppender">
<encoder>
<pattern>%date %-5level [%class{0}.%M:%line] %msg%n</pattern>
</encoder>
<append>true</append>
<file>../../logs/jupyter-java-kernel.log</file>
</appender>

<logger name="com.twosigma.beakerx" level="debug">
<appender-ref ref="FILE_GROOVY" />
<appender-ref ref="STDOUT" />
</logger>

<root level="info">
<appender-ref ref="STDOUT" />
</root>

</configuration>
27 changes: 27 additions & 0 deletions kernel/kotlin/src/main/resources/logback.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration debug="true">

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%date %-5level [%class{0}.%M:%line] %msg%n</pattern>
</encoder>
</appender>

<appender name="FILE_KOTLIN" class="ch.qos.logback.core.FileAppender">
<encoder>
<pattern>%date %-5level [%class{0}.%M:%line] %msg%n</pattern>
</encoder>
<append>true</append>
<file>../../logs/jupyter-kotlin-kernel.log</file>
</appender>

<logger name="com.twosigma.beakerx" level="debug">
<appender-ref ref="FILE_KOTLIN" />
<appender-ref ref="STDOUT" />
</logger>

<root level="info">
<appender-ref ref="STDOUT" />
</root>

</configuration>
27 changes: 27 additions & 0 deletions kernel/scala/src/main/resources/logback.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration debug="true">

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%date %-5level [%class{0}.%M:%line] %msg%n</pattern>
</encoder>
</appender>

<appender name="FILE_SCALA" class="ch.qos.logback.core.FileAppender">
<encoder>
<pattern>%date %-5level [%class{0}.%M:%line] %msg%n</pattern>
</encoder>
<append>true</append>
<file>../../logs/jupyter-scala-kernel.log</file>
</appender>

<logger name="com.twosigma.beakerx" level="debug">
<appender-ref ref="FILE_KOTLIN" />
<appender-ref ref="STDOUT" />
</logger>

<root level="info">
<appender-ref ref="STDOUT" />
</root>

</configuration>
27 changes: 27 additions & 0 deletions kernel/sql/src/main/resources/logback.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration debug="true">

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%date %-5level [%class{0}.%M:%line] %msg%n</pattern>
</encoder>
</appender>

<appender name="FILE_SQL" class="ch.qos.logback.core.FileAppender">
<encoder>
<pattern>%date %-5level [%class{0}.%M:%line] %msg%n</pattern>
</encoder>
<append>true</append>
<file>../../logs/jupyter-sql-kernel.log</file>
</appender>

<logger name="com.twosigma.beakerx" level="debug">
<appender-ref ref="FILE_SQL" />
<appender-ref ref="STDOUT" />
</logger>

<root level="info">
<appender-ref ref="STDOUT" />
</root>

</configuration>

0 comments on commit 856b705

Please sign in to comment.