From 536bc979cc057d366fef4fdda96c321543c354c8 Mon Sep 17 00:00:00 2001 From: hael Date: Thu, 12 Sep 2024 06:25:17 +0000 Subject: [PATCH] services instead of running services --- manage.html | 27 +++++++++++++++++++++++---- scan.php | 27 +++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/manage.html b/manage.html index cf3b901..d19b73f 100644 --- a/manage.html +++ b/manage.html @@ -56,8 +56,8 @@
-Running services -
Loading...
+Services +
Loading...
@@ -180,11 +180,30 @@ function check_deployment(additional) { }); } +function check_services() { + var url = 'scan.php?op=check_services'; + jQuery.get(url, function(data) { + if (data!="") { + jQuery("#services").html(data); + } + else setTimeout(check_services, 1000); + }); +} + +function get_services() { + var url = 'scan.php?op=services'; + jQuery.get(url, function(data) { + if (data=="OK") { + setTimeout(check_services, 1000); + } + }); +} + function check_containers() { var url = 'scan.php?op=check_containers'; jQuery.get(url, function(data) { if (data!="") { - jQuery("#running").html(data); + jQuery("#containers").html(data); } else setTimeout(check_containers, 1000); }); @@ -204,7 +223,7 @@ jQuery(document).ready(function(){ get_system(); get_repositories(); get_deployments(); - get_containers(); + get_services(); jQuery('#settings_btn').click(function() { jQuery('#settings').toggle(); diff --git a/scan.php b/scan.php index 7023fd3..1dcba96 100644 --- a/scan.php +++ b/scan.php @@ -58,6 +58,33 @@ switch ($_GET["op"]) { } else echo "WAIT"; break; + case "services": + $arr = array("STATUS" => 0); + $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT); + + $op = "services"; //"init:".date("YmdHis"); + redis_set($op,$json); + echo "OK"; // TODO? + break; + case "check_services": + $arr = check_redis("web_out","services"); + if (!empty($arr)) { + foreach ($arr as $key=>$data) { + if ($key=="services") { + if ($data["INSTALL_STATUS"]==2) echo "NEW"; + elseif ($data["INSTALL_STATUS"]==1) { + foreach ($data["INSTALLED_SERVICES"] as $service_name => $content) { + //echo base64_decode($content); + echo $service_name."
"; + } + echo "
"; + } + redis_remove("$key"); + } + } + } + else echo "WAIT"; + break; case "deployments": $arr = array("STATUS" => 0); $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);