You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2011/03/17 19:56:31 UTC
svn commit: r1082641 - in /activemq/activemq-apollo/trunk:
apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
apollo-util/src/main/scala/org/apache/activemq/apollo/util/FileSupport.scala
Author: chirino
Date: Thu Mar 17 18:56:30 2011
New Revision: 1082641
URL: http://svn.apache.org/viewvc?rev=1082641&view=rev
Log:
Fixup logging.
Modified:
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/FileSupport.scala
Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala?rev=1082641&r1=1082640&r2=1082641&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala Thu Mar 17 18:56:30 2011
@@ -78,7 +78,7 @@ class Run extends Action {
Apollo.print_banner(session.getConsole)
// Load the configs and start the brokers up.
- session.getConsole.print("Loading configuration file '%s'.".format(conf))
+ session.getConsole.println("Loading configuration file '%s'.".format(conf))
val store = new FileConfigStore
store.file = conf
Modified: activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/FileSupport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/FileSupport.scala?rev=1082641&r1=1082640&r2=1082641&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/FileSupport.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/FileSupport.scala Thu Mar 17 18:56:30 2011
@@ -174,11 +174,7 @@ object ProcessSupport {
implicit def to_process_builder(args:Seq[String]):ProcessBuilder = new ProcessBuilder().command(args : _*)
- def launch(command:String*)(func: (Int, Array[Byte], Array[Byte])=>Unit ):Unit = {
- val p:ProcessBuilder = command
- println("launching: "+p)
- launch(p)(func)
- }
+ def launch(command:String*)(func: (Int, Array[Byte], Array[Byte])=>Unit ):Unit = launch(command)(func)
def launch(p:ProcessBuilder, in:InputStream=null)(func: (Int, Array[Byte], Array[Byte]) => Unit):Unit = {
val out = new ByteArrayOutputStream
val err = new ByteArrayOutputStream