merge conflict

Author: Ahed92Wakim

src/DBTransactionRetryHelper.php

@@ -22,7 +22,7 @@ class DBTransactionRetryHelper
      * @throws QueryException
      * @throws Throwable
      */
-    public static function transactionWithRetry(callable $callback, int $maxRetries = 5, int $retryDelay = 5, string $logFileName = 'mysql-deadlocks-log'): mixed
+    public static function transactionWithRetry(callable $callback, int $maxRetries = 3, int $retryDelay = 2, string $logFileName = 'mysql-deadlocks'): mixed
     {
         $attempt = 0;
         $log = [];
@@ -113,6 +113,7 @@ protected static function buildLogContext(QueryException $e, int $attempt): arra
 
         return array_merge([
             'attempt' => $attempt,
+            'errorInfo' => $e->errorInfo,
             'ExceptionName' => get_class($e),
             'QueryException' => $e->getMessage(),
             'trace' => getDebugBacktraceArray() ?? null,

src/Helper.php

@@ -24,21 +24,24 @@ function generateLog($var, $logFileName, $logType = 'error'): void
         $date = function_exists('now') ? now()->toDateString() : date('Y-m-d');
 
         if (empty($logFileName)) {
-            $logFilePath = storage_path('logs/general_' . $date . '.log');
+            $logFilePath = storage_path('logs/' . date('Y-m-d') . 'general_' . $date . '.log');
         } else {
-            $logFilePath = storage_path("logs/{$logFileName}_" . $date . '.log');
+            $logFilePath = storage_path("logs/" . date('Y-m-d') . "{$logFileName}_" . $date . '.log');
         }
         $log = Log::build([
             'driver' => 'single',
             'path' => $logFilePath,
         ]);
-        $payload = is_array($var) ? $var : ['message' => (string) $var];
+        $payload = is_array($var) ? $var : ['message' => (string)$var];
+        $attempts = $var['attempt'] ?? 0;
+        $errorInfo = $var['errorInfo'][2] ?? '';
+
         if ($logType === 'error') {
-            $log->error($payload);
+            $log->error($attempts . ' ' . $errorInfo, $payload);
         } elseif ($logType === 'warning') {
-            $log->warning($payload);
+            $log->warning($attempts . ' ' . $errorInfo, $payload);
         } else {
-            $log->info($payload);
+            $log->info($attempts . ' ' . $errorInfo, $payload);
         }
     }
 }