Revert Async txn logging [Revert #103] #104

TanmoySG · Apr 23, 2023 · 5db33a2 · 5db33a2
2 parents f69590e + ea65915
commit 5db33a2
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 22 deletions.
diff --git a/internal/server/handlers/collection.go b/internal/server/handlers/collection.go
@@ -47,7 +47,7 @@ func (wh wdbHandlers) CreateCollection(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, entities)
+	wh.handleTransactions(c, resp, entities)
 	return nil
 }
 
@@ -78,7 +78,7 @@ func (wh wdbHandlers) FetchCollection(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, entities)
+	wh.handleTransactions(c, resp, entities)
 	return nil
 }
 
@@ -108,6 +108,6 @@ func (wh wdbHandlers) DeleteCollection(c *fiber.Ctx) error {
 		return err
 	}
 
-	go  wh.handleTransactions(c, resp, entities)
+	wh.handleTransactions(c, resp, entities)
 	return nil
 }
diff --git a/internal/server/handlers/common.go b/internal/server/handlers/common.go
@@ -99,7 +99,6 @@ func validateRequest(request any) *er.WdbError {
 }
 
 func (wh wdbHandlers) handleTransactions(c *fiber.Ctx, apiResponse response.ApiResponse, entities model.Entities) {
-	var err error
 	if txlogs.IsTxnLoggable(apiResponse.Response.Action) {
 		if apiResponse.Response.Status == response.StatusSuccess {
 			databaseEntity := *entities.Databases
@@ -117,12 +116,15 @@ func (wh wdbHandlers) handleTransactions(c *fiber.Ctx, apiResponse response.ApiR
 			}
 
 			txnLog := txlogs.CreateTxLog(txnAction, txnActor, apiResponse.Response.Status, txnEntityPath, txnHttpDetails)
-			err = wh.wdbTxLogs.Log(txnLog)
+			err := wh.wdbTxLogs.Log(txnLog)
+			if err != nil {
+				log.Errorf("error logging transaction: %s", err)
+			}
+
 			err = wh.wdbTxLogs.Commit()
-
+			if err != nil {
+				log.Errorf("error logging transaction: %s", err)
+			}
 		}
 	}
-	if err != nil {
-		log.Errorf("error logging transaction: %s", err)
-	}
 }
diff --git a/internal/server/handlers/data.go b/internal/server/handlers/data.go
@@ -43,7 +43,7 @@ func (wh wdbHandlers) AddData(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, entities)
+	wh.handleTransactions(c, resp, entities)
 	return nil
 }
 
@@ -85,7 +85,7 @@ func (wh wdbHandlers) ReadData(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, entities)
+	wh.handleTransactions(c, resp, entities)
 
 	return nil
 }
@@ -128,7 +128,7 @@ func (wh wdbHandlers) DeleteData(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, entities)
+	wh.handleTransactions(c, resp, entities)
 	return nil
 }
 
@@ -175,6 +175,6 @@ func (wh wdbHandlers) UpdateData(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, entities)
+	wh.handleTransactions(c, resp, entities)
 	return nil
 }
diff --git a/internal/server/handlers/database.go b/internal/server/handlers/database.go
@@ -41,7 +41,7 @@ func (wh wdbHandlers) CreateDatabase(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, entities)
+	wh.handleTransactions(c, resp, entities)
 
 	return nil
 }
@@ -70,7 +70,7 @@ func (wh wdbHandlers) FetchDatabase(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, entities)
+	wh.handleTransactions(c, resp, entities)
 
 	return nil
 }
@@ -98,6 +98,6 @@ func (wh wdbHandlers) DeleteDatabase(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, entities)
+	wh.handleTransactions(c, resp, entities)
 	return nil
 }
diff --git a/internal/server/handlers/hello.go b/internal/server/handlers/hello.go
@@ -25,6 +25,6 @@ func (wh wdbHandlers) Hello(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, noEntities)
+	wh.handleTransactions(c, resp, noEntities)
 	return nil
 }
diff --git a/internal/server/handlers/roles.go b/internal/server/handlers/roles.go
@@ -42,7 +42,7 @@ func (wh wdbHandlers) CreateRole(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, noEntities)
+	wh.handleTransactions(c, resp, noEntities)
 	return nil
 }
 
@@ -65,6 +65,6 @@ func (wh wdbHandlers) ListRoles(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, noEntities)
+	wh.handleTransactions(c, resp, noEntities)
 	return nil
 }
diff --git a/internal/server/handlers/users.go b/internal/server/handlers/users.go
@@ -37,7 +37,7 @@ func (wh wdbHandlers) LoginUser(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, noEntities)
+	wh.handleTransactions(c, resp, noEntities)
 
 	return nil
 }
@@ -63,7 +63,7 @@ func (wh wdbHandlers) CreateUser(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, noEntities)
+	wh.handleTransactions(c, resp, noEntities)
 	return nil
 }
 
@@ -128,6 +128,6 @@ func (wh wdbHandlers) CheckPermissions(c *fiber.Ctx) error {
 		return err
 	}
 
-	go wh.handleTransactions(c, resp, noEntities)
+	wh.handleTransactions(c, resp, noEntities)
 	return nil
 }