1
0
Fork 0

hswaw/site: remove mirko dependency

Change-Id: Id64cccadcd1e109035ed09f62086772fa615dd72
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1690
Reviewed-by: q3k <q3k@hackerspace.pl>
Reviewed-by: radex <radex@hackerspace.pl>
master
radex 2023-10-09 00:07:04 +02:00
parent d318d7e6d4
commit a28fa4d7f2
3 changed files with 7 additions and 14 deletions

View File

@ -14,7 +14,6 @@ go_library(
importpath = "code.hackerspace.pl/hscloud/hswaw/site",
visibility = ["//visibility:private"],
deps = [
"//go/mirko",
"//hswaw/site/calendar",
"//hswaw/site/static:static_go",
"//hswaw/site/templates:templates_go",

View File

@ -11,7 +11,7 @@ It replaces the old [www-main](https://code.hackerspace.pl/q3k/www-main) app.
Running locally
---
$ bazel run //hswaw/site -- -hspki_disable
$ bazel run //hswaw/site
And point your web browser to 127.0.0.1:8080.

View File

@ -1,6 +1,7 @@
package main
import (
"context"
"flag"
"fmt"
"math/rand"
@ -11,7 +12,6 @@ import (
"sync"
"time"
"code.hackerspace.pl/hscloud/go/mirko"
"github.com/golang/glog"
"code.hackerspace.pl/hscloud/hswaw/site/calendar"
@ -42,14 +42,12 @@ func main() {
rand.Seed(time.Now().UnixNano())
mi := mirko.New()
if err := mi.Listen(); err != nil {
glog.Exitf("Listen failed: %v", err)
}
// TODO(q3k): use sigint-interruptible context
ctx := context.Background()
s := &service{}
go s.feedWorker(mi.Context())
go s.eventsWorker(mi.Context())
go s.feedWorker(ctx)
go s.eventsWorker(ctx)
mux := http.NewServeMux()
s.registerHTTP(mux)
@ -61,11 +59,7 @@ func main() {
}
}()
if err := mi.Serve(); err != nil {
glog.Exitf("Serve failed: %v", err)
}
<-mi.Done()
<-ctx.Done()
}
var (