+log

container.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"log"
 	"strings"
 
 	"github.com/docker/docker/api/types/container"
@@ -32,20 +33,20 @@ func (c *Containers) Adds(ctrs Containers) {
 	c.Containers = append(c.Containers, ctrs.Containers...)
 }
 
-func get_ollama_containers(host Host, all bool) Containers {
+func get_containers_list(host Host, all bool) Containers {
 
 	ctr_list := Containers{}
 
 	cli, err := client.NewClientWithOpts(client.WithHost(fmt.Sprintf("tcp://%s:%s", host.IP, host.Port)))
 	if err != nil {
-		fmt.Println(err)
+		log.Println(err)
 		return ctr_list
 	}
 	defer cli.Close()
 
 	containers, err := cli.ContainerList(context.Background(), container.ListOptions{All: all})
 	if err != nil {
-		fmt.Println(err)
+		log.Println(err)
 		return ctr_list
 	}
 

host.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"regexp"
 	"strings"
@@ -72,13 +73,13 @@ type Details struct {
 	Quantization_level string   `json:"quantization_level"`
 }
 
-func get_ollama_tags(hosts Hosts) (Models, error) {
+func get_models_list(hosts Hosts) (Models, error) {
 
 	var ctr Containers
 
 	for _, host := range hosts.Hosts {
-		fmt.Printf("get ollama containers: %s -> %s\n", host.IP, host.Port)
-		ctr.Adds(get_ollama_containers(host, false))
+		log.Printf("get llm server containers: %s -> %s\n", host.IP, host.Port)
+		ctr.Adds(get_containers_list(host, false))
 	}
 
 	retval := []Model{}
@@ -112,7 +113,7 @@ func get_ollama_tags(hosts Hosts) (Models, error) {
 					mods.Models[n].State = "running"
 					mods.Models[n].Container = engine.Name
 					mods.Models[n].Engine = "ollama"
-					fmt.Printf("mod: %s - %s:%d\n", mods.Models[n].Name, mods.Models[n].Ip, mods.Models[n].Port)
+					log.Printf("mod: %s - %s:%d\n", mods.Models[n].Name, mods.Models[n].Ip, mods.Models[n].Port)
 				}
 
 				retval = append(retval, mods.Models...)
@@ -149,7 +150,7 @@ func get_ollama_tags(hosts Hosts) (Models, error) {
 					mods.Models[n].State = "running"
 					mods.Models[n].Container = engine.Name
 					mods.Models[n].Engine = "vllm"
-					fmt.Printf("mod: %s - %s:%d\n", mods.Models[n].Name, mods.Models[n].Ip, mods.Models[n].Port)
+					log.Printf("mod: %s - %s:%d\n", mods.Models[n].Name, mods.Models[n].Ip, mods.Models[n].Port)
 				}
 
 				retval = append(retval, mods.Models...)
@@ -168,7 +169,7 @@ func (h *Hosts) Add(s string) {
 func (h *Hosts) Init(server string) error {
 
 	if debug {
-		fmt.Printf("server: %s\n", server)
+		log.Printf("server: %s\n", server)
 	}
 
 	servers := strings.Split(server, ",")

main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"log"
 	"os"
 	"strings"
@@ -41,7 +40,7 @@ func read_config() string {
 	}
 
 	if debug {
-		fmt.Printf("config: '%s'\n", server_list)
+		log.Printf("config: '%s'\n", server_list)
 	}
 
 	return server_list
@@ -51,16 +50,18 @@ func main() {
 
 	var server_list string
 
+	log.SetFlags(log.LstdFlags | log.Lshortfile)
+
 	flag.Usage = usage
 	flag.Parse()
 
 	if version {
-		fmt.Printf("%s: %s\n", os.Args[0], _Version)
+		log.Printf("%s: %s\n", os.Args[0], _Version)
 		os.Exit(0)
 	}
 
 	if servers == "" && config == "" {
-		fmt.Println("no servers specified")
+		log.Println("no servers specified")
 		usage()
 	}
 
@@ -74,15 +75,15 @@ func main() {
 	error := hosts.Init(server_list)
 
 	if error != nil {
-		panic(error)
+		log.Fatalln(error)
 	}
 
 	r := gin.Default()
 	r.Use(cors.Default())
 	r.GET("/api/tags", func(c *gin.Context) {
-		models, err := get_ollama_tags(hosts)
+		models, err := get_models_list(hosts)
 		if err != nil {
-			panic(err)
+			log.Println(err)
 		}
 		c.JSON(200, models)
 	})
@@ -98,8 +99,8 @@ func main() {
 
 	r.ForwardedByClientIP = true
 
-	fmt.Println("Starting server on port " + port)
+	log.Println("Starting server on port " + port)
 	r.Run(":" + port)
 
-	fmt.Print("END")
+	log.Print("END")
 }