Changeset 652 in code for trunk/db_postgres.go

Timestamp:

Oct 18, 2021, 5:15:15 PM (4 years ago)

Author:

contact

Message:

Add context args to Database interface

This is a mecanical change, which just lifts up the context.TODO()
calls from inside the DB implementations to the callers.

Future work involves properly wiring up the contexts when it makes
sense.

File:

• trunk/db_postgres.go (modified) (13 diffs)

trunk/db_postgres.go

@@ -148 +148 @@
 }
 
-func (db *PostgresDB) Stats() (*DatabaseStats, error) {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) Stats(ctx context.Context) (*DatabaseStats, error) {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()
 
@@ -164 +164 @@
 }
 
-func (db *PostgresDB) ListUsers() ([]User, error) {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) ListUsers(ctx context.Context) ([]User, error) {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()
 
@@ -193 +193 @@
 }
 
-func (db *PostgresDB) GetUser(username string) (*User, error) {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) GetUser(ctx context.Context, username string) (*User, error) {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()
 
@@ -211 +211 @@
 }
 
-func (db *PostgresDB) StoreUser(user *User) error {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) StoreUser(ctx context.Context, user *User) error {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()
 
@@ -235 +235 @@
 }
 
-func (db *PostgresDB) DeleteUser(id int64) error {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) DeleteUser(ctx context.Context, id int64) error {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()
 
@@ -243 +243 @@
 }
 
-func (db *PostgresDB) ListNetworks(userID int64) ([]Network, error) {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) ListNetworks(ctx context.Context, userID int64) ([]Network, error) {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()
 
@@ -287 +287 @@
 }
 
-func (db *PostgresDB) StoreNetwork(userID int64, network *Network) error {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) StoreNetwork(ctx context.Context, userID int64, network *Network) error {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()
 
@@ -339 +339 @@
 }
 
-func (db *PostgresDB) DeleteNetwork(id int64) error {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) DeleteNetwork(ctx context.Context, id int64) error {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()
 
@@ -347 +347 @@
 }
 
-func (db *PostgresDB) ListChannels(networkID int64) ([]Channel, error) {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) ListChannels(ctx context.Context, networkID int64) ([]Channel, error) {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()
 
@@ -381 +381 @@
 }
 
-func (db *PostgresDB) StoreChannel(networkID int64, ch *Channel) error {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) StoreChannel(ctx context.Context, networkID int64, ch *Channel) error {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()
 
@@ -409 +409 @@
 }
 
-func (db *PostgresDB) DeleteChannel(id int64) error {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) DeleteChannel(ctx context.Context, id int64) error {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()
 
@@ -417 +417 @@
 }
 
-func (db *PostgresDB) ListDeliveryReceipts(networkID int64) ([]DeliveryReceipt, error) {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) ListDeliveryReceipts(ctx context.Context, networkID int64) ([]DeliveryReceipt, error) {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()
 
@@ -445 +445 @@
 }
 
-func (db *PostgresDB) StoreClientDeliveryReceipts(networkID int64, client string, receipts []DeliveryReceipt) error {
-        ctx, cancel := context.WithTimeout(context.TODO(), postgresQueryTimeout)
+func (db *PostgresDB) StoreClientDeliveryReceipts(ctx context.Context, networkID int64, client string, receipts []DeliveryReceipt) error {
+        ctx, cancel := context.WithTimeout(ctx, postgresQueryTimeout)
         defer cancel()