Linux does not have SIGINFO

[godlighty.git] / cmd / godlighty / main.go

diff --git a/cmd/godlighty/main.go b/cmd/godlighty/main.go
index 46c5d87cc7efb916ca853ac545ded532aff6f256..1344aaa40ca51d29ea5fc709a658bee4634c8615 100644 (file)
--- a/cmd/godlighty/main.go
+++ b/cmd/godlighty/main.go
@@ -31,15 +31,19 @@ import (
        "syscall"
        "time"
 
+       "github.com/davecgh/go-spew/spew"
        "golang.org/x/net/netutil"
 
        "go.stargrave.org/godlighty"
-       _ "go.stargrave.org/godlighty/rc"
+       _ "go.stargrave.org/godlighty/rc/cfg"
 )
 
 const MaxConns = 128
 
-var GracefulTime = 10 * time.Second
+var (
+       GracefulTime = 10 * time.Second
+       RWTimeout    = 30 * time.Second
+)
 
 func main() {
        bind := flag.String("bind", "[::]:80", "Address to bind and listen on")
@@ -56,7 +60,7 @@ func main() {
        shutdown := make(chan os.Signal)
        signal.Notify(shutdown, syscall.SIGTERM, syscall.SIGINT, syscall.SIGHUP)
        exitErr := make(chan error)
-       l, err := net.Listen("tcp", *bind)
+       l, err := godlighty.DeadlinedListen("tcp", *bind, RWTimeout, RWTimeout)
        if err != nil {
                log.Fatalln(err)
        }
@@ -91,7 +95,20 @@ func main() {
                }
        }
 
-       srv := http.Server{Handler: godlighty.MainHandler}
+       info := make(chan os.Signal)
+       signal.Notify(info, InfoSignal)
+       go func() {
+               for {
+                       <-info
+                       spew.Fdump(os.Stdout, godlighty.Hosts)
+               }
+       }()
+
+       srv := http.Server{
+               Handler:           godlighty.MainHandler,
+               ReadHeaderTimeout: RWTimeout,
+               IdleTimeout:       time.Minute,
+       }
        go func() {
                <-shutdown
                log.Println("shutting down")
@@ -101,11 +118,8 @@ func main() {
        }()
        var ll net.Listener
        if *doTLS {
-               tlsCfg := tls.Config{
-                       GetCertificate: godlighty.GetCertificate,
-                       NextProtos:     []string{"h2", "http/1.1"},
-               }
-               ll = tls.NewListener(netutil.LimitListener(l, MaxConns), &tlsCfg)
+               tlsCfg := godlighty.NewTLSConfig()
+               ll = tls.NewListener(netutil.LimitListener(l, MaxConns), tlsCfg)
        } else {
                ll = netutil.LimitListener(l, MaxConns)
        }