Improved JdbcJournalConfig

NextGenTel · Dec 7, 2016 · ab6c869 · ab6c869
1 parent 7b80e46
commit ab6c869
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/...rnal/src/main/scala/no/nextgentel/oss/akkatools/persistence/jdbcjournal/JdbcJournal.scala b/...rnal/src/main/scala/no/nextgentel/oss/akkatools/persistence/jdbcjournal/JdbcJournal.scala
@@ -34,13 +34,13 @@ object JdbcJournalConfig {
   }
 
   // Java helper
-  def create(dataSource: DataSource, schemaName: String, fatalErrorHandler: JdbcJournalErrorHandler) = JdbcJournalConfig(dataSource, fatalErrorHandler, StorageRepoConfig(Option(schemaName)))
+  def create(dataSource: DataSource, schemaName: String, fatalErrorHandler: JdbcJournalErrorHandler) = JdbcJournalConfig(dataSource, Option(fatalErrorHandler), StorageRepoConfig(Option(schemaName)))
 }
 
 case class JdbcJournalConfig
 (
   dataSource: DataSource,
-  fatalErrorHandler: JdbcJournalErrorHandler, // The fatalErrorHandler is called when something bad has happened - like getting unique PK key errors - Which is probably a symptom of split brain
+  fatalErrorHandler: Option[JdbcJournalErrorHandler] = None, // The fatalErrorHandler is called when something bad has happened - like getting unique PK key errors - Which is probably a symptom of split brain
   storageRepoConfig: StorageRepoConfig = StorageRepoConfig(schemaName = None),
   persistenceIdParser:PersistenceIdParser = new PersistenceIdParserImpl('/'),
   maxRowsPrRead: Int = 1000

diff --git a/...rnal/src/main/scala/no/nextgentel/oss/akkatools/persistence/jdbcjournal/StorageRepo.scala b/...rnal/src/main/scala/no/nextgentel/oss/akkatools/persistence/jdbcjournal/StorageRepo.scala
@@ -5,6 +5,7 @@ import java.util.Date
 import javax.sql.DataSource
 
 import no.nextgentel.oss.akkatools.cluster.ClusterNodeRepo
+import org.slf4j.LoggerFactory
 import org.sql2o.data.{Row, Table}
 import org.sql2o._
 import org.sql2o.quirks.OracleQuirks
@@ -54,14 +55,18 @@ case class StorageRepoConfig
 
 )
 
-class StorageRepoImpl(sql2o: Sql2o, config:StorageRepoConfig, _errorHandler:JdbcJournalErrorHandler) extends StorageRepo with ClusterNodeRepo {
+class StorageRepoImpl(sql2o: Sql2o, config:StorageRepoConfig, _errorHandler:Option[JdbcJournalErrorHandler]) extends StorageRepo with ClusterNodeRepo {
 
-  def this(dataSource:DataSource, config:StorageRepoConfig, _errorHandler:JdbcJournalErrorHandler) = this(new Sql2o(dataSource, new OracleQuirks()), config, _errorHandler)
+  def this(dataSource:DataSource, config:StorageRepoConfig = StorageRepoConfig(), _errorHandler:Option[JdbcJournalErrorHandler] = None) = this(new Sql2o(dataSource, new OracleQuirks()), config, _errorHandler)
 
   import scala.collection.JavaConverters._
 
   // wrap it
-  val errorHandler = new JdbcJournalDetectFatalOracleErrorHandler(_errorHandler)
+  val errorHandler = new JdbcJournalDetectFatalOracleErrorHandler(_errorHandler.getOrElse(
+    new JdbcJournalErrorHandler {
+      override def onError(e: Exception): Unit = LoggerFactory.getLogger(getClass).error("Fatal jdbc-journal-error (custom errorHandler not configured): " + e, e)
+    }
+  ))
 
   lazy val schemaPrefix = config.schemaName.map( s => s + ".").getOrElse("")
   lazy val tableName_journal = s"${schemaPrefix}${config.tableName_journal}"

diff --git a/.../test/scala/no/nextgentel/oss/akkatools/persistence/jdbcjournal/JdbcReadJournalTest.scala b/.../test/scala/no/nextgentel/oss/akkatools/persistence/jdbcjournal/JdbcReadJournalTest.scala
@@ -42,7 +42,7 @@ abstract class JdbcReadJournalTestBase(configName:String) extends FunSuite with
   }
 
   lazy val readJournal = {
-    JdbcJournalConfig.setConfig(configName, JdbcJournalConfig(DataSourceUtil.createDataSource("JdbcReadJournalTest"), errorHandler, StorageRepoConfig(), new PersistenceIdParserImpl('-')))
+    JdbcJournalConfig.setConfig(configName, JdbcJournalConfig(DataSourceUtil.createDataSource("JdbcReadJournalTest"), Some(errorHandler), StorageRepoConfig(), new PersistenceIdParserImpl('-')))
     PersistenceQuery(system).readJournalFor[JdbcReadJournal](JdbcReadJournal.identifier)
   }
 

diff --git a/...est/scala/no/nextgentel/oss/akkatools/persistence/jdbcjournal/JdbcSnapshotStoreTest.scala b/...est/scala/no/nextgentel/oss/akkatools/persistence/jdbcjournal/JdbcSnapshotStoreTest.scala
@@ -33,7 +33,7 @@ class JdbcSnapshotStoreTest (_system:ActorSystem) extends FunSuite with TestKitB
 
   before {
     // Remember: Since JdbcJournal.init() is static this will break if we run tests in parallel
-    JdbcJournalConfig.setConfig(configName, JdbcJournalConfig(DataSourceUtil.createDataSource("JdbcSnapshotStoreTest"), errorHandler, StorageRepoConfig(), new PersistenceIdParserImpl('-')))
+    JdbcJournalConfig.setConfig(configName, JdbcJournalConfig(DataSourceUtil.createDataSource("JdbcSnapshotStoreTest"), Some(errorHandler), StorageRepoConfig(), new PersistenceIdParserImpl('-')))
   }
 
   override protected def afterAll(): Unit = {

diff --git a/...al/src/test/scala/no/nextgentel/oss/akkatools/persistence/jdbcjournal/MyJournalSpec.scala b/...al/src/test/scala/no/nextgentel/oss/akkatools/persistence/jdbcjournal/MyJournalSpec.scala
@@ -21,7 +21,7 @@ class MyJournalSpec extends JournalSpec (
     override def onError(e: Exception): Unit = log.error("JdbcJournalErrorHandler.onError", e)
   }
 
-  JdbcJournalConfig.setConfig("MyJournalSpec", JdbcJournalConfig(DataSourceUtil.createDataSource("MyJournalSpec"), errorHandler, StorageRepoConfig(), new PersistenceIdParserImpl('-')))
+  JdbcJournalConfig.setConfig("MyJournalSpec", JdbcJournalConfig(DataSourceUtil.createDataSource("MyJournalSpec"), Some(errorHandler), StorageRepoConfig(), new PersistenceIdParserImpl('-')))
 
   override protected def supportsRejectingNonSerializableObjects: CapabilityFlag = false
 }
@@ -40,6 +40,6 @@ class MySnapshotStoreSpec extends SnapshotStoreSpec (
     override def onError(e: Exception): Unit = log.error("JdbcJournalErrorHandler.onError", e)
   }
 
-  JdbcJournalConfig.setConfig("MySnapshotStoreSpec", JdbcJournalConfig(DataSourceUtil.createDataSource("MySnapshotStoreSpec"), errorHandler, StorageRepoConfig(), new PersistenceIdParserImpl('-')))
+  JdbcJournalConfig.setConfig("MySnapshotStoreSpec", JdbcJournalConfig(DataSourceUtil.createDataSource("MySnapshotStoreSpec"), None, StorageRepoConfig(), new PersistenceIdParserImpl('-')))
 
 }
diff --git a/.../src/test/scala/no/nextgentel/oss/akkatools/persistence/jdbcjournal/StorageRepoTest.scala b/.../src/test/scala/no/nextgentel/oss/akkatools/persistence/jdbcjournal/StorageRepoTest.scala
@@ -15,7 +15,7 @@ class StorageRepoTest extends FunSuite with Matchers with BeforeAndAfterAll with
     override def onError(e: Exception): Unit = log.error("onError", e)
   }
 
-  lazy val repo = new StorageRepoImpl(new Sql2o(DataSourceUtil.createDataSource("StorageRepoTest"), new OracleQuirks), StorageRepoConfig(), errorHandler)
+  lazy val repo = new StorageRepoImpl(new Sql2o(DataSourceUtil.createDataSource("StorageRepoTest"), new OracleQuirks), StorageRepoConfig(), Some(errorHandler))
 
   val nextId = new AtomicInteger(0)