1 files changed, 32 insertions, 8 deletions
diff --git a/src/helsinki.at/rhimportd/rhimportd.go b/src/helsinki.at/rhimportd/rhimportd.go
index 01092ef..a2bce7b 100644
--- a/src/helsinki.at/rhimportd/rhimportd.go
+++ b/src/helsinki.at/rhimportd/rhimportd.go
@@ -26,12 +26,15 @@ package main
 
 import (
 	"flag"
-	"fmt"
-	"html"
-	"net/http"
-	_ "net/http/pprof"
+	"helsinki.at/rhimport"
+	"log"
+	"os"
+	"os/signal"
+	"sync"
 )
 
+var rhl = log.New(os.Stderr, "[rhimportd]\t", log.LstdFlags)
+
 func main() {
 	addr_s := flag.String("addr", ":4000", "addr:port to listen on, default: ':4000'")
 	help := flag.Bool("help", false, "show usage")
@@ -42,9 +45,30 @@ func main() {
 		return
 	}
 
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, "Hello, %q", html.EscapeString(r.URL.Path))
-	})
+	var wg sync.WaitGroup
+
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		rhl.Println("start web-srv")
+		rhimport.ServeWeb(*addr_s)
+		rhl.Println("web finished")
+	}()
+
+	alldone := make(chan bool)
+	go func() {
+		defer func() { alldone <- true }()
+		wg.Wait()
+	}()
+
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, os.Interrupt)
 
-	http.ListenAndServe(*addr_s, nil)
+	select {
+	case <-c:
+		rhl.Println("received interrupt, shutdown")
+		return
+	case <-alldone:
+		return
+	}
 }