commit dee223922daacb357e79b711db568f97d85bb9e0
parent 2befa711f29e7c4b3f2299dabdc51ec23419b2a1
Author: Florian Dold <florian@dold.me>
Date: Fri, 22 Sep 2023 18:09:59 +0200
re-add support for unix socket DB connection
Diffstat:
4 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/Database.kt b/bank/src/main/kotlin/tech/libeufin/bank/Database.kt
@@ -23,6 +23,8 @@ package tech.libeufin.bank
import org.postgresql.jdbc.PgConnection
import org.slf4j.Logger
import org.slf4j.LoggerFactory
+import tech.libeufin.util.getJdbcConnectionFromPg
+import java.net.URI
import java.sql.DriverManager
import java.sql.PreparedStatement
import java.sql.SQLException
@@ -39,7 +41,6 @@ fun BankAccountTransaction.expectRowId(): Long = this.dbRowId ?: throw internalS
private val logger: Logger = LoggerFactory.getLogger("tech.libeufin.bank.Database")
-
class Database(private val dbConfig: String, private val bankCurrency: String) {
private var dbConn: PgConnection? = null
private var dbCtr: Int = 0
@@ -56,7 +57,10 @@ class Database(private val dbConfig: String, private val bankCurrency: String) {
return
dbConn?.close()
preparedStatements.clear()
- dbConn = DriverManager.getConnection(dbConfig).unwrap(PgConnection::class.java)
+ // Translate "normal" postgresql:// connection URI to something that JDBC likes.
+ val jdbcConnStr = getJdbcConnectionFromPg(dbConfig)
+ logger.info("connecting to database via JDBC string '$jdbcConnStr'")
+ dbConn = DriverManager.getConnection(jdbcConnStr).unwrap(PgConnection::class.java)
dbCtr = 0
dbConn?.execSQLUpdate("SET search_path TO libeufin_bank;")
}
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/Main.kt b/bank/src/main/kotlin/tech/libeufin/bank/Main.kt
@@ -367,7 +367,7 @@ fun durationFromPretty(s: String): Long {
fun TalerConfig.requireValueDuration(section: String, option: String): Long {
val durationStr = lookupValueString(section, option)
if (durationStr == null) {
- throw TalerConfigError("expected amount for section $section, option $option, but config value is empty")
+ throw TalerConfigError("expected duration for section $section, option $option, but config value is empty")
}
return durationFromPretty(durationStr)
}
diff --git a/bank/src/test/kotlin/Common.kt b/bank/src/test/kotlin/Common.kt
@@ -22,12 +22,10 @@ import tech.libeufin.bank.Database
import tech.libeufin.bank.TalerAmount
import tech.libeufin.util.execCommand
-// Init the database and sets the currency to KUDOS.
+/**
+ * Init the database and sets the currency to KUDOS.
+ */
fun initDb(): Database {
- System.setProperty(
- "BANK_DB_CONNECTION_STRING",
- "jdbc:postgresql:///libeufincheck"
- )
execCommand(
listOf(
"libeufin-bank-dbinit",
@@ -37,7 +35,7 @@ fun initDb(): Database {
),
throwIfFails = true
)
- return Database("jdbc:postgresql:///libeufincheck", "KUDOS")
+ return Database("postgresql:///libeufincheck", "KUDOS")
}
fun getTestContext(
diff --git a/util/src/main/kotlin/DB.kt b/util/src/main/kotlin/DB.kt
@@ -18,10 +18,10 @@
*/
package tech.libeufin.util
+
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.coroutineScope
-import logger
import net.taler.wallet.crypto.Base32Crockford
import org.jetbrains.exposed.sql.Database
import org.jetbrains.exposed.sql.Transaction
@@ -29,8 +29,12 @@ import org.jetbrains.exposed.sql.name
import org.jetbrains.exposed.sql.transactions.TransactionManager
import org.jetbrains.exposed.sql.transactions.transaction
import org.postgresql.jdbc.PgConnection
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
import java.net.URI
+private val logger: Logger = LoggerFactory.getLogger("tech.libeufin.util.DB")
+
fun getCurrentUser(): String = System.getProperty("user.name")
fun isPostgres(): Boolean {
@@ -51,13 +55,16 @@ fun isPostgres(): Boolean {
enum class NotificationsChannelDomains(val value: Int) {
// When payments with well-formed Taler subject arrive.
LIBEUFIN_TALER_INCOMING(3000),
+
// A transaction happened for a particular user. The payload
// informs about the direction.
LIBEUFIN_REGIO_TX(3001),
+
// When an incoming fiat payment is downloaded from Nexus.
// Happens when a customer wants to withdraw Taler coins in the
// regional currency.
LIBEUFIN_SANDBOX_FIAT_INCOMING(3002),
+
// When Nexus has ingested a new transactions from the bank it
// is connected to. This event carries incoming and outgoing
// payments, and it specifies that in its payload. The direction
@@ -86,7 +93,7 @@ fun buildChannelName(
fun Transaction.postgresNotify(
channel: String,
payload: String? = null
- ) {
+) {
logger.debug("Sending NOTIFY on channel '$channel' with payload '$payload'")
if (payload != null) {
val argEnc = Base32Crockford.encode(payload.toByteArray())
@@ -120,8 +127,10 @@ class PostgresListenHandle(val channelName: String) {
"Could not find the default database, won't get Postgres notifications."
)
private val conn = db.connector().connection as PgConnection
+
// Gets set to the NOTIFY's payload, in case one exists.
var receivedPayload: String? = null
+
// Signals whether the connection should be kept open,
// after one (and possibly not expected) event arrives.
// This gives more flexibility to the caller.
@@ -133,6 +142,7 @@ class PostgresListenHandle(val channelName: String) {
stmt.close()
logger.debug("LISTENing on channel: $channelName")
}
+
fun postgresUnlisten() {
val stmt = conn.createStatement()
stmt.execute("UNLISTEN $channelName")
@@ -149,11 +159,14 @@ class PostgresListenHandle(val channelName: String) {
fun postgresGetNotifications(timeoutMs: Long): Boolean {
if (timeoutMs == 0L)
- logger.info("Database notification checker has timeout == 0," +
- " that waits FOREVER until a notification arrives."
+ logger.info(
+ "Database notification checker has timeout == 0," +
+ " that waits FOREVER until a notification arrives."
)
- logger.debug("Waiting Postgres notifications on channel " +
- "'$channelName' for $timeoutMs millis.")
+ logger.debug(
+ "Waiting Postgres notifications on channel " +
+ "'$channelName' for $timeoutMs millis."
+ )
val maybeNotifications = this.conn.getNotifications(timeoutMs.toInt())
if (maybeNotifications == null || maybeNotifications.isEmpty()) {
logger.debug("DB notifications not found on channel $channelName.")
@@ -169,7 +182,7 @@ class PostgresListenHandle(val channelName: String) {
logger.debug("Found DB notifications on channel $channelName")
// Only ever used for singleton notifications.
assert(maybeNotifications.size == 1)
- if(maybeNotifications[0].parameter.isNotEmpty())
+ if (maybeNotifications[0].parameter.isNotEmpty())
this.receivedPayload = maybeNotifications[0].parameter
this.likelyCloseConnection()
return true
@@ -245,32 +258,31 @@ fun connectWithSchema(jdbcConn: String, schemaName: String? = null) {
conn.schema = schemaName
}
)
- try { transaction { this.db.name } }
- catch (e: Throwable) {
+ try {
+ transaction { this.db.name }
+ } catch (e: Throwable) {
logger.error("Test query failed: ${e.message}")
throw Exception("Failed connection to: $jdbcConn")
}
}
-// Prepends "jdbc:" to the Postgres database connection string.
-fun getJdbcConnectionFromPg(pgConn: String): String {
- return "jdbc:$pgConn"
-}
/**
* This function converts a postgresql://-URI to a JDBC one.
* It is only needed because JDBC strings based on Unix domain
* sockets need individual intervention.
*/
-fun _getJdbcConnectionFromPg(pgConn: String): String {
+fun getJdbcConnectionFromPg(pgConn: String): String {
if (!pgConn.startsWith("postgresql://") && !pgConn.startsWith("postgres://")) {
logger.info("Not a Postgres connection string: $pgConn")
throw Exception("Not a Postgres connection string: $pgConn")
}
var maybeUnixSocket = false
val parsed = URI(pgConn)
- val hostAsParam: String? = if (parsed.query != null)
+ val hostAsParam: String? = if (parsed.query != null) {
getQueryParam(parsed.query, "host")
- else null
+ } else {
+ null
+ }
/**
* In some cases, it is possible to leave the hostname empty
* and specify it via a query param, therefore a "postgresql:///"-starting
@@ -278,7 +290,8 @@ fun _getJdbcConnectionFromPg(pgConn: String): String {
* https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
*/
if (parsed.host == null &&
- (hostAsParam == null || hostAsParam.startsWith('/'))) {
+ (hostAsParam == null || hostAsParam.startsWith('/'))
+ ) {
maybeUnixSocket = true
}
if (maybeUnixSocket) {
