mirror of
https://github.com/usmannasir/cyberpanel.git
synced 2026-05-06 20:47:35 +02:00
Version Management: upgrade log polling, progress 0-100%, origin label
- upgradeStatus: handle missing log and cat stderr; read upgrade_progress JSON; return progress; remove progress file on completion. - upgrade.py: ProgressPathNew sidecar, init log/progress at SoftUpgrade start, monotonic progress from log size and 100 on Upgrade Completed, cleanup progress file after soft upgrade. - upgrade() POST returns progress 0 when upgrade thread starts. - versionManagment: relabel fork row as Your repository (git origin). - system-status.js: show Upgrade Progress percentage during polling (3x paths synced via cp).
This commit is contained in:
@@ -696,6 +696,12 @@ app.controller('versionManagment', function ($scope, $http, $timeout) {
|
||||
$scope.updateStarted = false;
|
||||
$scope.updateFinish = true;
|
||||
$scope.couldNotConnect = true;
|
||||
var startPct = (typeof response.data.progress !== 'undefined' && isFinite(response.data.progress))
|
||||
? response.data.progress : 0;
|
||||
var progEl = document.getElementById('upgradeProgressLog');
|
||||
if (progEl) {
|
||||
progEl.innerText = 'Upgrade Progress: ' + startPct + '%';
|
||||
}
|
||||
getUpgradeStatus();
|
||||
} else {
|
||||
$scope.updateError = false;
|
||||
@@ -740,6 +746,12 @@ app.controller('versionManagment', function ($scope, $http, $timeout) {
|
||||
function ListInitialDatas(response) {
|
||||
console.log(response.data.upgradeLog);
|
||||
|
||||
var pct = (typeof response.data.progress !== 'undefined' && isFinite(response.data.progress))
|
||||
? response.data.progress : 0;
|
||||
var progEl = document.getElementById('upgradeProgressLog');
|
||||
if (progEl) {
|
||||
progEl.innerText = 'Upgrade Progress: ' + pct + '%';
|
||||
}
|
||||
|
||||
if (response.data.upgradeStatus === 1) {
|
||||
|
||||
@@ -753,6 +765,9 @@ app.controller('versionManagment', function ($scope, $http, $timeout) {
|
||||
$scope.updateStarted = true;
|
||||
$scope.updateFinish = false;
|
||||
$scope.couldNotConnect = true;
|
||||
if (progEl) {
|
||||
progEl.innerText = 'Upgrade Progress: 100%';
|
||||
}
|
||||
|
||||
} else {
|
||||
$scope.upgradelogBox = false;
|
||||
|
||||
Reference in New Issue
Block a user