11use crate :: api:: server:: start_server;
22use crate :: checks:: hardware:: HardwareChecker ;
33use crate :: checks:: issue:: IssueReport ;
4- use crate :: checks:: software:: software_check ;
4+ use crate :: checks:: software:: SoftwareChecker ;
55use crate :: console:: Console ;
66use crate :: docker:: taskbridge:: TaskBridge ;
77use crate :: docker:: DockerService ;
@@ -291,8 +291,8 @@ pub async fn execute_command(
291291 let issue_tracker = Arc :: new ( RwLock :: new ( IssueReport :: new ( ) ) ) ;
292292 let mut hardware_check = HardwareChecker :: new ( Some ( issue_tracker. clone ( ) ) ) ;
293293 let node_config = hardware_check. check_hardware ( node_config) . await . unwrap ( ) ;
294- if let Err ( err ) = software_check :: run_software_check ( Some ( issue_tracker. clone ( ) ) ) . await
295- {
294+ let software_checker = SoftwareChecker :: new ( Some ( issue_tracker. clone ( ) ) ) ;
295+ if let Err ( err ) = software_checker . check_software ( & node_config ) . await {
296296 Console :: user_error ( & format ! ( "❌ Software check failed: {}" , err) ) ;
297297 std:: process:: exit ( 1 ) ;
298298 }
@@ -634,8 +634,9 @@ pub async fn execute_command(
634634 Console :: section ( "🔍 PRIME WORKER SYSTEM CHECK" ) ;
635635 let issues = Arc :: new ( RwLock :: new ( IssueReport :: new ( ) ) ) ;
636636
637- // Run hardware checks
637+ // Run checks
638638 let mut hardware_checker = HardwareChecker :: new ( Some ( issues. clone ( ) ) ) ;
639+ let software_checker = SoftwareChecker :: new ( Some ( issues. clone ( ) ) ) ;
639640 let node_config = Node {
640641 id : String :: new ( ) ,
641642 ip_address : String :: new ( ) ,
@@ -645,12 +646,15 @@ pub async fn execute_command(
645646 compute_pool_id : 0 ,
646647 } ;
647648
648- if let Err ( err) = hardware_checker. check_hardware ( node_config) . await {
649- Console :: user_error ( & format ! ( "❌ Hardware check failed: {}" , err) ) ;
650- std:: process:: exit ( 1 ) ;
651- }
649+ let node_config = match hardware_checker. check_hardware ( node_config) . await {
650+ Ok ( node_config) => node_config,
651+ Err ( err) => {
652+ Console :: user_error ( & format ! ( "❌ Hardware check failed: {}" , err) ) ;
653+ std:: process:: exit ( 1 ) ;
654+ }
655+ } ;
652656
653- if let Err ( err) = software_check :: run_software_check ( Some ( issues . clone ( ) ) ) . await {
657+ if let Err ( err) = software_checker . check_software ( & node_config ) . await {
654658 Console :: user_error ( & format ! ( "❌ Software check failed: {}" , err) ) ;
655659 std:: process:: exit ( 1 ) ;
656660 }
0 commit comments