From f9c0fd1a728e752b99d6761ed8eaec7f28a7743a Mon Sep 17 00:00:00 2001
From: DevSoftTech Server <info.devsofttech@gmail.com>
Date: Mon, 3 Aug 2026 17:00:21 +0530
Subject: [PATCH] fix: simplify HMS update to only git pull and add timeout
 protection

Update improvements:
- Renamed button from "Update System" to "Update HMS"
- Changed update to run only 'git pull' (removed database migrations)
- Added 60-second timeout to prevent system hangup
- Better error messages for timeouts and failures
- Logs update status (running/success/failed/timeout) to history
- Confirmation dialog now says "Pull latest HMS code from repository?"

This ensures quick updates without long-running migrations that could hang
the admin interface. Database migrations can be run separately as needed.
---
 app/Libraries/SystemOperations.php           | 62 ++++++++++++--------
 app/Views/Setting/Admin/system_ops_panel.php |  2 +-
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/app/Libraries/SystemOperations.php b/app/Libraries/SystemOperations.php
index f917bae..396ce50 100644
--- a/app/Libraries/SystemOperations.php
+++ b/app/Libraries/SystemOperations.php
@@ -46,49 +46,61 @@ class SystemOperations
         $repoPath = ROOTPATH;
         $logFile = WRITEPATH . 'system_update.log';
         $startedAt = date('Y-m-d H:i:s');
+        
         $entry = [
             'timestamp' => $startedAt,
             'type' => 'update',
             'status' => 'running',
-            'message' => 'Update started',
+            'message' => 'HMS update started (git pull)',
         ];
         $this->appendHistory($entry);
 
-        $commands = [
-            'cd ' . escapeshellarg($repoPath) . ' && git pull origin main 2>&1',
-            'cd ' . escapeshellarg($repoPath) . ' && php spark migrate --namespace App 2>&1',
-        ];
+        // Run git pull with timeout protection
+        $command = 'cd ' . escapeshellarg($repoPath) . ' && timeout 60 git pull origin main 2>&1';
+        $result = $this->runCommand($command);
+        $output = $result['output'];
 
-        $output = [];
-        foreach ($commands as $command) {
-            $result = $this->runCommand($command);
-            $output[] = $result['output'];
-            if ($result['exit_code'] !== 0) {
-                $entry = [
-                    'timestamp' => date('Y-m-d H:i:s'),
-                    'type' => 'update',
-                    'status' => 'failed',
-                    'message' => 'Update failed',
-                    'detail' => trim(implode("\n", $output)),
-                ];
-                $this->appendHistory($entry);
-                file_put_contents($logFile, trim(implode("\n", $output)) . PHP_EOL, FILE_APPEND);
+        // Check for timeout
+        if (str_contains($output, 'Terminated') || $result['exit_code'] === 124) {
+            $entry = [
+                'timestamp' => date('Y-m-d H:i:s'),
+                'type' => 'update',
+                'status' => 'timeout',
+                'message' => 'HMS update timed out (60 seconds)',
+                'detail' => 'The git pull operation took too long. Check network connectivity and try again.',
+            ];
+            $this->appendHistory($entry);
+            file_put_contents($logFile, 'TIMEOUT: ' . $output . PHP_EOL, FILE_APPEND);
 
-                return ['ok' => false, 'message' => 'Update failed', 'output' => trim(implode("\n", $output))];
-            }
+            return ['ok' => false, 'message' => 'Update timed out after 60 seconds. Please check network and try again.', 'output' => $output];
         }
 
+        if ($result['exit_code'] !== 0) {
+            $entry = [
+                'timestamp' => date('Y-m-d H:i:s'),
+                'type' => 'update',
+                'status' => 'failed',
+                'message' => 'HMS update failed',
+                'detail' => $output,
+            ];
+            $this->appendHistory($entry);
+            file_put_contents($logFile, 'FAILED: ' . $output . PHP_EOL, FILE_APPEND);
+
+            return ['ok' => false, 'message' => 'Update failed. Check logs for details.', 'output' => $output];
+        }
+
+        // Success
         $entry = [
             'timestamp' => date('Y-m-d H:i:s'),
             'type' => 'update',
             'status' => 'success',
-            'message' => 'Update completed',
-            'detail' => trim(implode("\n", $output)),
+            'message' => 'HMS update completed',
+            'detail' => $output,
         ];
         $this->appendHistory($entry);
-        file_put_contents($logFile, trim(implode("\n", $output)) . PHP_EOL, FILE_APPEND);
+        file_put_contents($logFile, 'SUCCESS: ' . $output . PHP_EOL, FILE_APPEND);
 
-        return ['ok' => true, 'message' => 'Update completed successfully', 'output' => trim(implode("\n", $output))];
+        return ['ok' => true, 'message' => 'HMS update completed successfully', 'output' => $output];
     }
 
     public function runServerAction(string $action): array
diff --git a/app/Views/Setting/Admin/system_ops_panel.php b/app/Views/Setting/Admin/system_ops_panel.php
index cdb9f11..d172e0e 100644
--- a/app/Views/Setting/Admin/system_ops_panel.php
+++ b/app/Views/Setting/Admin/system_ops_panel.php
@@ -44,7 +44,7 @@
                 <h5 class="mb-0">Maintenance Actions</h5>
             </div>
             <div class="card-body d-grid gap-2">
-                <button class="btn btn-primary" id="btnUpdateSystem">Update System</button>
+                <button class="btn btn-primary" id="btnUpdateSystem">Update HMS</button>
                 <button class="btn btn-outline-warning" id="btnRestartWeb">Restart Web Server</button>
                 <button class="btn btn-outline-info" id="btnRestartPhp">Restart PHP-FPM</button>
                 <button class="btn btn-outline-danger" id="btnShutdown">Shutdown Server</button>