Skip to content

Commit

Permalink
#20 Fix log file location in development mode
Browse files Browse the repository at this point in the history
rename install folder in package
  • Loading branch information
To-om committed May 8, 2017
1 parent 0b85658 commit 27af4fe
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 14 deletions.
26 changes: 13 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ mappings in Universal ~= {
case (file, "conf/apllication.sample") => Seq(file -> "conf/application.conf")
case other => Seq(other)
} ++ Seq(
file("install/cortex.service") -> "install/cortex.service",
file("install/cortex.conf") -> "install/cortex.conf",
file("install/cortex") -> "install/cortex"
file("package/cortex.service") -> "package/cortex.service",
file("package/cortex.conf") -> "package/cortex.conf",
file("package/cortex") -> "package/cortex"
)
}

Expand All @@ -52,13 +52,13 @@ packageDescription := """--""".stripMargin
defaultLinuxInstallLocation := "/opt"
linuxPackageMappings ~= { _.map { pm =>
val mappings = pm.mappings.filterNot {
case (file, path) => path.startsWith("/opt/cortex/install") || path.startsWith("/opt/cortex/conf")
case (file, path) => path.startsWith("/opt/cortex/package") || path.startsWith("/opt/cortex/conf")
}
com.typesafe.sbt.packager.linux.LinuxPackageMapping(mappings, pm.fileData).withConfig()
} :+ packageMapping(
file("install/cortex.service") -> "/etc/systemd/system/cortex.service",
file("install/cortex.conf") -> "/etc/init/cortex.conf",
file("install/cortex") -> "/etc/init.d/cortex",
file("package/cortex.service") -> "/etc/systemd/system/cortex.service",
file("package/cortex.conf") -> "/etc/init/cortex.conf",
file("package/cortex") -> "/etc/init.d/cortex",
file("conf/application.sample") -> "/etc/cortex/application.conf",
file("conf/logback.xml") -> "/etc/cortex/logback.xml"
).withConfig()
Expand All @@ -73,10 +73,10 @@ packageBin := {
//debianPackageRecommends := Seq("elasticsearch")
debianPackageDependencies += "java8-runtime-headless | java8-runtime"
maintainerScripts in Debian := maintainerScriptsFromDirectory(
baseDirectory.value / "install" / "debian",
baseDirectory.value / "package" / "debian",
Seq(DebianConstants.Postinst, DebianConstants.Prerm, DebianConstants.Postrm)
)
linuxEtcDefaultTemplate in Debian := (baseDirectory.value / "install" / "etc_default_cortex").asURL
linuxEtcDefaultTemplate in Debian := (baseDirectory.value / "package" / "etc_default_cortex").asURL
linuxMakeStartScript in Debian := None

// RPM //
Expand All @@ -86,12 +86,12 @@ rpmUrl := Some("http://thehive-project.org/")
rpmLicense := Some("AGPL")
rpmRequirements += "java-1.8.0-openjdk-headless"
maintainerScripts in Rpm := maintainerScriptsFromDirectory(
baseDirectory.value / "install" / "rpm",
baseDirectory.value / "package" / "rpm",
Seq(RpmConstants.Pre, RpmConstants.Preun, RpmConstants.Postun)
)
linuxPackageSymlinks in Rpm := Nil
rpmPrefix := Some(defaultLinuxInstallLocation.value)
linuxEtcDefaultTemplate in Rpm := (baseDirectory.value / "install" / "etc_default_cortex").asURL
linuxEtcDefaultTemplate in Rpm := (baseDirectory.value / "package" / "etc_default_cortex").asURL

// DOCKER //
import com.typesafe.sbt.packager.docker.{ Cmd, ExecCmd }
Expand All @@ -102,9 +102,9 @@ dockerUpdateLatest := true
dockerEntrypoint := Seq("/opt/cortex/entrypoint")
dockerExposedPorts := Seq(9000)
mappings in Docker ++= Seq(
file("install/docker/entrypoint") -> "/opt/cortex/entrypoint",
file("package/docker/entrypoint") -> "/opt/cortex/entrypoint",
file("conf/logback.xml") -> "/etc/cortex/logback.xml",
file("install/empty") -> "/var/log/cortex/application.log")
file("package/empty") -> "/var/log/cortex/application.log")
mappings in Docker ~= (_.filterNot {
case (_, filepath) => filepath == "/opt/cortex/conf/application.conf"
})
Expand Down
2 changes: 1 addition & 1 deletion conf/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
converterClass="play.api.libs.logback.ColoredLevel" />

<appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>/var/log/cortex/application.log</file>
<file>${application.home:-.}/logs/application.log</file>
<encoder>
<pattern>%date [%level] from %logger in %thread - %message%n%xException</pattern>
</encoder>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
39 changes: 39 additions & 0 deletions package/logback.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">

<conversionRule conversionWord="coloredLevel"
converterClass="play.api.libs.logback.ColoredLevel" />

<appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>/var/log/cortex/application.log</file>
<encoder>
<pattern>%date [%level] from %logger in %thread - %message%n%xException</pattern>
</encoder>
</appender>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%coloredLevel %logger{15} - %message%n%xException{10}
</pattern>
</encoder>
</appender>

<appender name="ASYNCFILE" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="FILE" />
</appender>

<appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="STDOUT" />
</appender>

<logger name="play" level="INFO" />
<logger name="application" level="INFO" />

<logger name="com.gargoylesoftware.htmlunit.javascript" level="OFF" />

<root level="INFO">
<appender-ref ref="ASYNCFILE" />
<appender-ref ref="ASYNCSTDOUT" />
</root>

</configuration>

0 comments on commit 27af4fe

Please sign in to comment.