Navigation Menu

Skip to content

Commit

Permalink
Merge branch 'patch-1' of https://github.com/oza/fluentd-standalone i…
Browse files Browse the repository at this point in the history
…nto oza-patch-1
  • Loading branch information
xerial committed Jan 4, 2017
2 parents 0d8f002 + 792a805 commit 93f1276
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/scala/xerial/fluentd/FluentdStandalone.scala
Expand Up @@ -85,7 +85,7 @@ class FluentdStandalone(val config:FluentdConfig) extends Logger {
prepare(config)

info(s"Starting fluentd")
val process = Shell.launchProcess(s"${config.fluentdCmd} -c ${config.getConfigFile}")
val process = Shell.launchProcess(s"${config.fluentdCmd} -c ${config.getConfigFile} --no-supervisor")
fluentdProcess = Some(process)
val t = new Thread(new Runnable {
def run() {
Expand Down Expand Up @@ -211,4 +211,4 @@ class FluentdStandalone(val config:FluentdConfig) extends Logger {
}
}

}
}

0 comments on commit 93f1276

Please sign in to comment.