activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1082666 - /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
Date Thu, 17 Mar 2011 19:55:02 GMT
Author: chirino
Date: Thu Mar 17 19:55:02 2011
New Revision: 1082666

URL: http://svn.apache.org/viewvc?rev=1082666&view=rev
Log:
Better version loggin

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala?rev=1082666&r1=1082665&r2=1082666&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
Thu Mar 17 19:55:02 2011
@@ -178,7 +178,7 @@ object Broker extends Log {
   }
 
   val version = using(getClass().getResourceAsStream("version.txt")) { source=>
-    read_text(source)
+    read_text(source).trim
   }
 
 }
@@ -375,7 +375,7 @@ class Broker() extends BaseService {
       // Try to get a better version from the OS itself..
       val los = os.toLowerCase()
       if( los.startsWith("linux") ) {
-        capture("lsb_release -sd").map("%s (%s)".format(_, rc)).getOrElse(rc)
+        capture("lsb_release", "-sd").map("%s (%s)".format(_, rc)).getOrElse(rc)
       } else {
         rc
       }
@@ -386,7 +386,7 @@ class Broker() extends BaseService {
       val vendor = System.getProperty("java.vendor")
       val version =System.getProperty("java.version")
       val vm =System.getProperty("java.vm.name")
-      "%s %s %s".format(vendor, version, vm)
+      "%s %s (%s)".format(vm, version, vendor)
     }
 
     console_log.info("OS     : %s", os)



Mime
View raw message