fix: tx management

Change-Id: Ib303237acec136dcd4d54453f814cb975c897e30

Author: smarcet

app/Services/UserActionService.php

@@ -56,6 +56,7 @@ public function addUserAction($user_id, $ip, $user_action, $realm = null, $user_
     {
         return $this->tx_service->transaction(function () use ($user_id, $ip, $user_action, $realm, $user_email) {
 
+            Log::debug(sprintf("UserActionService::addUserAction user %s action %s ip %s", $user_id, $user_action, $ip));
             $action = new UserAction();
             $action->setFromIp($ip);
             $action->setUserAction($user_action);

app/Services/Utils/DoctrineTransactionService.php

@@ -56,38 +56,36 @@ public function transaction(Closure $callback)
         while (!$done and $retry < self::MaxRetries) {
             try {
                 $em  = Registry::getManager($this->manager_name);
-                $con = $em->getConnection();
-
                 if (!$em->isOpen()) {
                     Log::warning("DoctrineTransactionService::transaction: entity manager is closed!, trying to re open...");
                     $em = Registry::resetManager($this->manager_name);
-                    // new entity manager
-                    $con = $em->getConnection();
                 }
 
-                $con->beginTransaction(); // suspend auto-commit
+                $em->getConnection()->beginTransaction(); // suspend auto-commit
                 $result = $callback($this);
                 $em->flush();
-                $con->commit();
+                $em->getConnection()->commit();
                 $done = true;
-            } catch (RetryableException $ex) {
-                Log::warning("retrying ...");
+            }
+            catch (RetryableException $ex) {
+                Log::warning($ex);
+                Log::warning("DoctrineTransactionService::transaction Retrying ...");
+                $em->close();
+                $em->getConnection()->rollBack();
                 Registry::resetManager($this->manager_name);
-                $con->rollBack();
                 Log::warning($ex);
                 $retry++;
                 if ($retry === self::MaxRetries) {
-                    $em->close();
-                    $con->rollBack();
-                    Registry::resetManager($this->manager_name);
+                    Log::info(sprintf("DoctrineTransactionService::transaction Max Retry Reached %s", $retry));
                     throw $ex;
                 }
-            } catch (Exception $ex) {
-                Log::warning("rolling back transaction");
+            }
+            catch (Exception $ex) {
+                Log::warning($ex);
                 $em->close();
-                $con->rollBack();
+                Log::warning("DoctrineTransactionService::transaction rolling back TX");
+                $em->getConnection()->rollBack();
                 Registry::resetManager($this->manager_name);
-                Log::warning($ex);
                 throw $ex;
             }
         }