clone/kvm
1
0
Fork 0
mirror of https://github.com/luckfox-eng29/kvm.git synced 2026-01-18 03:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup logging

Browse Source 
Make sure all logging output is called via the main logger instead of
stdlib `"log"` or `fmt.Print(f|ln)`.

Signed-off-by: SuperQ <superq@gmail.com>
This commit is contained in:
SuperQ
2025-03-01 09:48:13 +01:00
parent c5cec99797
commit 34e33e45bf
14 changed files with 92 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
native.go
View File

@@ -6,7 +6,6 @@ import (
"fmt"
"io"
"kvm/resource"
"log"
"net"
"os"
"os/exec"
@@ -61,7 +60,7 @@ func CallCtrlAction(action string, params map[string]interface{}) (*CtrlResponse
return nil, fmt.Errorf("error marshaling ctrl action: %w", err)
}
fmt.Println("sending ctrl action", string(jsonData))
logger.Infof("sending ctrl action: %s", string(jsonData))
err = WriteCtrlMessage(jsonData)
if err != nil {
@@ -104,16 +103,18 @@ func StartNativeSocketServer(socketPath string, handleClient func(net.Conn), isC
// Remove the socket file if it already exists
if _, err := os.Stat(socketPath); err == nil {
if err := os.Remove(socketPath); err != nil {
log.Fatalf("Failed to remove existing socket file %s: %v", socketPath, err)
logger.Errorf("Failed to remove existing socket file %s: %v", socketPath, err)
os.Exit(1)
}
}
listener, err := net.Listen("unixpacket", socketPath)
if err != nil {
log.Fatalf("Failed to start server on %s: %v", socketPath, err)
logger.Errorf("Failed to start server on %s: %v", socketPath, err)
os.Exit(1)
}
log.Printf("Server listening on %s", socketPath)
logger.Infof("Server listening on %s", socketPath)
go func() {
conn, err := listener.Accept()
@@ -188,24 +189,23 @@ func handleCtrlClient(conn net.Conn) {
func handleVideoClient(conn net.Conn) {
defer conn.Close()
log.Printf("Native video socket client connected: %v", conn.RemoteAddr())
logger.Infof("Native video socket client connected: %v", conn.RemoteAddr())
inboundPacket := make([]byte, maxFrameSize)
lastFrame := time.Now()
for {
n, err := conn.Read(inboundPacket)
if err != nil {
log.Println("error during read: %s", err)
logger.Warnf("error during read: %v", err)
return
}
now := time.Now()
sinceLastFrame := now.Sub(lastFrame)
lastFrame = now
//fmt.Println("Video packet received", n, sinceLastFrame)
if currentSession != nil {
err := currentSession.VideoTrack.WriteSample(media.Sample{Data: inboundPacket[:n], Duration: sinceLastFrame})
if err != nil {
log.Println("Error writing sample", err)
logger.Warnf("error writing sample: %v", err)
}
}
}
@@ -250,7 +250,7 @@ func ExtractAndRunNativeBin() error {
}
}()
fmt.Printf("Binary started with PID: %d\n", cmd.Process.Pid)
logger.Infof("Binary started with PID: %d", cmd.Process.Pid)
return nil
}