Merge branch 'chriskaliX:main' into main

theSecHunter · Dec 1, 2023 · b5690db · b5690db
2 parents 03a4f4d + aa15300
commit b5690db
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 22 deletions.
diff --git a/plugins/eguard/src/main.rs b/plugins/eguard/src/main.rs
@@ -90,26 +90,37 @@ fn main() -> Result<()> {
                         return;
                     }
 
-                    match tokio::time::timeout(timeout, client_c.receive_async()).await {
-                        Ok(result) => match result {
-                            Ok(task) => match serde_json::from_str::<BpfConfig>(task.get_data()) {
-                                Ok(config) => {
-                                    if let Err(e) = mgr_c.lock().unwrap().flush_config(config) {
-                                        error!("parse task failed: {}", e);
-                                    }
-                                }
-                                Err(e) => {
-                                    error!("parse task failed: {}", e);
-                                }
-                            },
-                            Err(e) => {
-                                error!("when receiving task, an error occurred: {}", e);
-                                control_s.store(true, Ordering::SeqCst);
-                                return;
-                            }
-                        },
-                        Err(_) => {}
+                    let result = match tokio::time::timeout(timeout, client_c.receive_async()).await {
+                        Ok(result) => result,
+                        Err(err) => {
+                            error!("get task failed:{}", err);
+                            continue;
+                        }
+                    };
+
+                    let task = match result {
+                        Ok(task) => task,
+                        Err(err) => {
+                            error!("when receiving task, an error occurred: {}", err);
+                            control_s.store(true, Ordering::SeqCst);
+                            return;
+                        }
+                    };
+
+                    let config = match serde_json::from_str::<BpfConfig>(task.get_data()) {
+                        Ok(config) => config,
+                        Err(e) => {
+                            error!("parse task failed: {}", e);
+                            continue;
+                        }
+                    };
+
+                    if let Err(e) = mgr_c.lock().unwrap().flush_config(config) {
+                        error!("flush task failed: {}", e);
+                        continue;
                     }
+
+                    info!("task parse success")
                 }
             });
             rt.shutdown_background();

diff --git a/server/webconsole/api/static/frontend/index.html b/server/webconsole/api/static/frontend/index.html
@@ -6,6 +6,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="/umi.21a330d4.js"></script>
+<script src="/umi.273740a8.js"></script>
 
 </body></html>