moved some code to seperate package

3 files changed, 111 insertions, 8 deletions

diff --git a/src/helsinki.at/rhimport/log.go b/src/helsinki.at/rhimport/log.go
new file mode 100644
index 0000000..46b0e52
--- /dev/null
+++ b/src/helsinki.at/rhimport/log.go
@@ -0,0 +1,38 @@
+//
+//  rhimportd
+//
+//  The Radio Helsinki Rivendell Import Daemon
+//
+//
+//  Copyright (C) 2015 Christian Pointner <equinox@helsinki.at>
+//
+//  This file is part of rhimportd.
+//
+//  rhimportd is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  any later version.
+//
+//  rhimportd is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with rhimportd. If not, see <http://www.gnu.org/licenses/>.
+//
+
+package rhimport
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+)
+
+var (
+	rhl = log.New(os.Stderr, "[rhimport]\t", log.LstdFlags)
+	// use ioutil.Discard to switch that thing off
+	// rhtl = log.New(os.Stderr, "[rhdbg]\t", log.LstdFlags)
+	rhtl = log.New(ioutil.Discard, "[rhimport-dbg]\t", log.LstdFlags)
+)
diff --git a/src/helsinki.at/rhimport/srvWeb.go b/src/helsinki.at/rhimport/srvWeb.go
new file mode 100644
index 0000000..f51c8e8
--- /dev/null
+++ b/src/helsinki.at/rhimport/srvWeb.go
@@ -0,0 +1,41 @@
+//
+//  rhimportd
+//
+//  The Radio Helsinki Rivendell Import Daemon
+//
+//
+//  Copyright (C) 2015 Christian Pointner <equinox@helsinki.at>
+//
+//  This file is part of rhimportd.
+//
+//  rhimportd is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  any later version.
+//
+//  rhimportd is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with rhimportd. If not, see <http://www.gnu.org/licenses/>.
+//
+
+package rhimport
+
+import (
+	"fmt"
+	"html"
+	"net/http"
+	_ "net/http/pprof"
+)
+
+func ServeWeb(addr_s string) {
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprintf(w, "Hello, %q", html.EscapeString(r.URL.Path))
+	})
+
+	rhl.Println("listening on", addr_s)
+	http.ListenAndServe(addr_s, nil)
+}
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
+	}
 }