gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[libeufin] branch master updated (2be63a2 -> fbf42e3)


From: gnunet
Subject: [libeufin] branch master updated (2be63a2 -> fbf42e3)
Date: Tue, 26 Jan 2021 18:31:27 +0100

This is an automated email from the git hooks/post-receive script.

ms pushed a change to branch master
in repository libeufin.

    from 2be63a2  only compile with 'make' (used to install)
     new a95f254  Avoid stack trace on a managed exception.
     new 916a318  include connection readiness in status
     new fbf42e3  fix task deletion

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../kotlin/tech/libeufin/nexus/ebics/EbicsNexus.kt |  3 ++-
 .../tech/libeufin/nexus/server/NexusServer.kt      | 28 ++++++++++------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsNexus.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsNexus.kt
index 50e13fe..307ab31 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsNexus.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsNexus.kt
@@ -160,7 +160,7 @@ suspend fun fetchEbicsBySpec(
         try {
             fetchEbicsC5x(spec.orderType, client, bankConnectionId, 
spec.orderParams, subscriberDetails)
         } catch (e: Exception) {
-            logger.warn("Ingestion failed for $spec", e)
+            logger.warn("Ingestion failed for $spec")
         }
     }
 }
@@ -593,6 +593,7 @@ fun getEbicsConnectionDetails(conn: 
NexusBankConnectionEntity): Any {
     val node = mapper.createObjectNode()
     node.put("type", conn.type)
     node.put("owner", conn.owner.username)
+    node.put("ready", true) // test with #6715 needed.
     node.set<JsonNode>("details", details)
     return node
 }
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
index a5ca7d0..ed714dc 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
@@ -480,26 +480,24 @@ fun serverMain(dbName: String, host: String, port: Int) {
 
             get("/bank-accounts/{accountId}/schedule/{taskId}") {
                 requireSuperuser(call.request)
+                val taskId = ensureNonNull(call.parameters["taskId"])
                 val task = transaction {
                     NexusScheduledTaskEntity.find {
-                        NexusScheduledTasksTable.taskName eq 
ensureNonNull(call.parameters["taskId"])
+                        NexusScheduledTasksTable.taskName eq taskId
                     }.firstOrNull()
                 }
+                if (task == null) throw NexusError(HttpStatusCode.NotFound, 
"Task ${taskId} wasn't found")
                 call.respond(
-                    if (task != null) {
-                        AccountTask(
-                            resourceId = task.resourceId,
-                            resourceType = task.resourceType,
-                            taskName = task.taskName,
-                            taskCronspec = task.taskCronspec,
-                            taskType = task.taskType,
-                            taskParams = task.taskParams,
-                            nextScheduledExecutionSec = 
task.nextScheduledExecutionSec,
-                            prevScheduledExecutionSec = 
task.prevScheduledExecutionSec
-                        )
-                    } else {
-                        object {}
-                    }
+                    AccountTask(
+                        resourceId = task.resourceId,
+                        resourceType = task.resourceType,
+                        taskName = task.taskName,
+                        taskCronspec = task.taskCronspec,
+                        taskType = task.taskType,
+                        taskParams = task.taskParams,
+                        nextScheduledExecutionSec = 
task.nextScheduledExecutionSec,
+                        prevScheduledExecutionSec = 
task.prevScheduledExecutionSec
+                    )
                 )
                 return@get
             }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]