hswaw/capacifier: remove mirko dependency
Change-Id: I3afbe1857c321ac6db1255d8a2fe1d9aa3da5c12
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1689
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/hswaw/capacifier/capacifier.go b/hswaw/capacifier/capacifier.go
index 0fcefd8..e3ec2ee 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 @@
ldap "github.com/go-ldap/ldap/v3"
"github.com/golang/glog"
-
- "code.hackerspace.pl/hscloud/go/mirko"
)
type server struct {
@@ -179,10 +178,8 @@
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 @@
}
}()
- if err := m.Serve(); err != nil {
- glog.Exitf("Serve(): %v", err)
- }
-
- <-m.Done()
+ <-ctx.Done()
}