Convert the code to the new client.Client interface.

[sysdb/webui.git] / main.go

diff --git a/main.go b/main.go
index 0b2bfae0e9b4aaf1b1aa9089a62736951d630726..5ded81417cedb53920b393cbaacd471d64ee9e9b 100644 (file)
--- a/main.go
+++ b/main.go
@@ -34,7 +34,6 @@ import (
        "os"
        "os/user"
 
-       "github.com/sysdb/go/client"
        "github.com/sysdb/webui/server"
 )
 
@@ -63,22 +62,7 @@ func main() {
        flag.Parse()
 
        log.Printf("Connecting to SysDB at %s.", *addr)
-       var conns []*client.Conn
-       for i := 0; i < 10; i++ {
-               conn, err := client.Connect(*addr, *username)
-               if err != nil {
-                       fatalf("Failed to connect to SysDB at %q: %v", *addr, err)
-               }
-               conns = append(conns, conn)
-       }
-       major, minor, patch, extra, err := conns[0].ServerVersion()
-       if err != nil {
-               fatalf("Failed to query server version: %v", err)
-       }
-       log.Printf("Connected to SysDB %d.%d.%d%s.", major, minor, patch, extra)
-
-       srv, err := server.New(server.Config{
-               Conns:        conns,
+       srv, err := server.New(*addr, *username, server.Config{
                TemplatePath: *tmpl,
                StaticPath:   *static,
        })