diff --git a/hswaw/capacifier/BUILD.bazel b/hswaw/capacifier/BUILD.bazel index 45d56f90..8956ae51 100644 --- a/hswaw/capacifier/BUILD.bazel +++ b/hswaw/capacifier/BUILD.bazel @@ -7,7 +7,6 @@ go_library( importpath = "code.hackerspace.pl/hscloud/hswaw/capacifier", visibility = ["//visibility:private"], deps = [ - "//go/mirko", "@com_github_go_ldap_ldap_v3//:ldap", "@com_github_golang_glog//:glog", ], diff --git a/hswaw/capacifier/capacifier.go b/hswaw/capacifier/capacifier.go index 0fcefd8b..e3ec2ee9 100644 --- a/hswaw/capacifier/capacifier.go +++ b/hswaw/capacifier/capacifier.go @@ -1,6 +1,7 @@ package main import ( + "context" "crypto/tls" "flag" "fmt" @@ -11,8 +12,6 @@ import ( ldap "github.com/go-ldap/ldap/v3" "github.com/golang/glog" - - "code.hackerspace.pl/hscloud/go/mirko" ) type server struct { @@ -179,10 +178,8 @@ func main() { glog.Exitf("-ldap_bind_pw must be set") } - m := mirko.New() - if err := m.Listen(); err != nil { - glog.Exitf("Listen(): %v", err) - } + // TODO(q3k): use sigint-interruptible context + ctx := context.Background() s := &server{} mux := http.NewServeMux() @@ -195,9 +192,5 @@ func main() { } }() - if err := m.Serve(); err != nil { - glog.Exitf("Serve(): %v", err) - } - - <-m.Done() + <-ctx.Done() }