Skip to content

Commit

Permalink
Merge pull request lightvector#92 from lightvector/final-tweaks
Browse files Browse the repository at this point in the history
Final tweaks
  • Loading branch information
lightvector committed Jan 16, 2016
2 parents ea4215c + a8cb26a commit 0f792d5
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
2 changes: 1 addition & 1 deletion frontend/jade/layouts/default.jade
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ html(lang="en")
body
block content
footer
|playarimaa.org (alpha test - this site is still under development)
|playarimaa.org (alpha test - this site is under development, please report any bugs to [email protected])
3 changes: 2 additions & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ object ArimaaServerBuild extends Build {
),

libraryDependencies ++= Seq(
"ch.qos.logback" % "logback-classic" % "1.1.2",
"com.typesafe" % "config" % "1.2.1",
"com.typesafe.akka" %% "akka-actor" % "2.3.4",
"com.typesafe.akka" %% "akka-testkit" % "2.3.4",
"com.h2database" % "h2" % "1.3.170",
"com.typesafe.slick" %% "slick" % "3.0.0",
"com.typesafe.scala-logging" %% "scala-logging" % "3.1.0",
"com.zaxxer" % "HikariCP-java6" % "2.3.3",
"javax.mail" % "javax.mail-api" % "1.5.4",
"javax.servlet" % "javax.servlet-api" % "3.1.0",
Expand All @@ -53,7 +55,6 @@ object ArimaaServerBuild extends Build {
"org.scala-lang" % "scala-library" % "2.11.6",
"org.scala-lang" % "scala-reflect" % "2.11.6",
"org.slf4j" % "slf4j-api" % "1.7.5",
"org.slf4j" % "slf4j-simple" % "1.7.5",
"org.postgresql" % "postgresql" % "9.3-1100-jdbc4"
),

Expand Down
25 changes: 25 additions & 0 deletions src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<configuration>
<appender name="STDOUT"
class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level%logger{36} - %msg%n</pattern>
</encoder>
</appender>

<appender name="FILE"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/current.log</file>
<rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>logs/%d{yyyy-MM-dd}.log</fileNamePattern>
</rollingPolicy>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level%logger{36} - %msg%n</pattern>
</encoder>
</appender>

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

0 comments on commit 0f792d5

Please sign in to comment.