searching for race condition at logger

Narigo · Narigo · commit 3ba68bb93815 · 2013-09-14T20:41:30.000+02:00
diff --git a/src/main/scala/io/vertx/asyncsql/database/ConnectionHandler.scala b/src/main/scala/io/vertx/asyncsql/database/ConnectionHandler.scala
@@ -16,13 +16,14 @@ import com.github.mauricio.async.db.RowData
 import collection.JavaConverters._
 import com.github.mauricio.async.db.postgresql.exceptions.GenericDatabaseException
 import org.vertx.scala.core.json._
+import org.vertx.scala.core.logging.Logger
 
 trait ConnectionHandler extends ScalaBusMod with VertxScalaHelpers {
   val verticle: Verticle
   def dbType: String
   val config: Configuration
-  lazy val pool = AsyncConnectionPool(verticle.vertx, dbType, config)
-  lazy val logger = verticle.container.logger()
+  val logger: Logger // = verticle.container.logger()
+  val pool = AsyncConnectionPool(verticle.vertx, dbType, config)
 
   def transactionStart: String = "START TRANSACTION;"
   def transactionEnd: String = "COMMIT;"
diff --git a/src/main/scala/io/vertx/asyncsql/database/MySqlConnectionHandler.scala b/src/main/scala/io/vertx/asyncsql/database/MySqlConnectionHandler.scala
@@ -2,8 +2,10 @@ package io.vertx.asyncsql.database
 
 import io.vertx.helpers.Verticle
 import com.github.mauricio.async.db.Configuration
+import org.vertx.scala.core.logging.Logger
 
 class MySqlConnectionHandler(val verticle: Verticle, val config: Configuration, val dbType: String = "mysql") extends ConnectionHandler {
+  val logger = new Logger(verticle.container.logger)
   override protected def escapeField(str: String): String = "`" + str.replace("`", "\\`") + "`"
   override protected def escapeString(str: String): String = "'" + str.replace("'", "''") + "'"
 
diff --git a/src/main/scala/io/vertx/asyncsql/database/PostgreSqlConnectionHandler.scala b/src/main/scala/io/vertx/asyncsql/database/PostgreSqlConnectionHandler.scala
@@ -2,7 +2,8 @@ package io.vertx.asyncsql.database
 
 import io.vertx.helpers.Verticle
 import com.github.mauricio.async.db.Configuration
+import org.vertx.scala.core.logging.Logger
 
 class PostgreSqlConnectionHandler(val verticle: Verticle, val config: Configuration, val dbType: String = "postgresql") extends ConnectionHandler {
-  
+  val logger = new Logger(verticle.container.logger)
 }
diff --git a/src/main/scala/io/vertx/asyncsql/database/pool/AsyncConnectionPool.scala b/src/main/scala/io/vertx/asyncsql/database/pool/AsyncConnectionPool.scala
@@ -47,7 +47,6 @@ trait AsyncConnectionPool[ConnType <: Connection] {
 object AsyncConnectionPool {
 
   def apply(vertx: Vertx, dbType: String, config: Configuration) = {
-    println("got db type: " + dbType)
     dbType match {
       case "postgresql" =>
         new PostgreSqlAsyncConnectionPool(
diff --git a/src/test/scala/io/vertx/asyncsql/test/BaseVertxIntegrationTest.scala b/src/test/scala/io/vertx/asyncsql/test/BaseVertxIntegrationTest.scala
@@ -9,9 +9,10 @@ import org.vertx.testtools.VertxAssert._
 import io.vertx.helpers.VertxExecutionContext
 import org.vertx.scala.core.eventbus.Message
 import java.util.concurrent.atomic.AtomicInteger
+import org.vertx.scala.core.logging.Logger
 
 trait BaseVertxIntegrationTest extends VertxExecutionContext { this: TestVerticle =>
-  lazy val log = getContainer().logger()
+  var log: Logger
 
   val address: String
 
diff --git a/src/test/scala/io/vertx/asyncsql/test/SqlTestVerticle.scala b/src/test/scala/io/vertx/asyncsql/test/SqlTestVerticle.scala
@@ -15,9 +15,15 @@ import org.vertx.scala.core.eventbus.Message
 import org.vertx.scala.core.Vertx
 import io.vertx.helpers.VertxScalaHelpers
 import org.vertx.scala.core.json._
+import org.vertx.scala.core.logging.Logger
 
 abstract class SqlTestVerticle extends org.vertx.testtools.TestVerticle with BaseVertxIntegrationTest with VertxScalaHelpers {
 
+  var log = {
+    println("logger initialized")
+    new Logger(getContainer().logger())
+  }
+
   override def start() = {
     initialize()
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@ package io.vertx.asyncsql.database`
`2`	`2`
`3`	`3`	`import io.vertx.helpers.Verticle`
`4`	`4`	`import com.github.mauricio.async.db.Configuration`
	`5`	`+import org.vertx.scala.core.logging.Logger`
`5`	`6`
`6`	`7`	`class PostgreSqlConnectionHandler(val verticle: Verticle, val config: Configuration, val dbType: String = "postgresql") extends ConnectionHandler {`
`7`		`-`
	`8`	`+ val logger = new Logger(verticle.container.logger)`
`8`	`9`	`}`