Skip to content

Commit

Permalink
Add .editorconfig and make sure we use LF (not CRLF) for line endings (
Browse files Browse the repository at this point in the history
…openzipkin#1603)

* Add .editorconfig and make sure we use LF (not CRLF) for line endings

* All code should be utf-8
  • Loading branch information
eirslett authored and adriancole committed Jun 5, 2017
1 parent 6db2c64 commit fc04097
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 14 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,7 @@
<header>${main.basedir}/src/etc/header.txt</header>
<excludes>
<exclude>.travis.yml</exclude>
<exclude>.editorconfig</exclude>
<exclude>.gitignore</exclude>
<exclude>.mvn/**</exclude>
<exclude>mvnw*</exclude>
Expand Down
28 changes: 14 additions & 14 deletions zipkin-storage/elasticsearch-http/src/test/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<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>
</appender>

<root level="info">
<appender-ref ref="STDOUT" />
</root>
</configuration>
<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>
</appender>

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

0 comments on commit fc04097

Please sign in to comment.