Merge pull request #13 from VanOns/feature/configurable-shell-timeout

Configurable shell timeout

Author: dnwjn

UPGRADING.md

@@ -6,16 +6,19 @@ across such a case, please let us know by [opening an issue][issues], or by addi
 
 ## v0.8.0
 
-* The namespace for the `AnonymizeUsers` processor has changed. Make sure to update your config file accordingly:
+* The namespace for the `AnonymizeUsers` processor was changed. Make sure to update your config file accordingly:
 
   ```diff
   - \VanOns\LaravelEnvironmentImporter\Processors\AnonymizeUsers::class
   + \VanOns\LaravelEnvironmentImporter\Processors\Data\AnonymizeUsers::class
   ```
 
+* The `db_timeout` configuration option was added (default: `60`, same as the default shell command timeout).
+  Set the option to `null` to disable the timeout.
+
 ## v0.6.0
 
-* The configuration for the `AnonymizeUsers` processor has changed. Make sure to update your config file accordingly, so
+* The configuration for the `AnonymizeUsers` processor was changed. Make sure to update your config file accordingly, so
   that it follows the following format:
 
   ```php

config/environment-importer.php

@@ -77,6 +77,20 @@
 
     'db_import_binary_path' => env('LEI_DB_IMPORT_BINARY_PATH', '/usr/bin'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Database Timeout
+    |--------------------------------------------------------------------------
+    |
+    | Here you can define the timeout (in seconds) for database operations.
+    | This includes dumping and importing the database.
+    |
+    | Set to `null` to disable the timeout.
+    |
+    */
+
+    'db_timeout' => env('LEI_DB_TIMEOUT', 60),
+
     /*
     |--------------------------------------------------------------------------
     | Backup Path

src/Commands/ImportEnvironmentCommand.php

@@ -509,7 +509,7 @@ protected function importMysqlDump(string $dumpFile): void
 
         $process = Process::fromShellCommandline($command, env: [
             'MYSQL_PWD' => DB::getConfig('password'),
-        ]);
+        ], timeout: $this->getConfigValue('db_timeout'));
 
         $process->run();
 
@@ -701,7 +701,7 @@ protected function importSingle(string|int $key, string|array $extra): void
         );
 
         $progressBar = $this->getOutput()->createProgressBar();
-        $process = Process::fromShellCommandline($command)->setTimeout(null);
+        $process = Process::fromShellCommandline($command, timeout: $this->getConfigValue('db_timeout'));
         $total = 0;
         $current = 0;
         $rsyncStart = now();