no more logger

.gitignore

@@ -0,0 +1 @@
+vpntorfeed

main.go

@@ -5,12 +5,15 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"local/jbtServiceDiscovery/jbt"
-	"local/logger"
-	natsc "local/nats-client"
+	"local/jbtserve/jbt"
+	"local/natsc"
 	"local/system/sysconf"
+	"log"
 	"net/http"
+	"os"
+	"os/signal"
 	"regexp"
+	"syscall"
 	"time"
 )
 
@@ -18,14 +21,14 @@ func main() {
 	exit := make(chan bool)
 	config := sysconf.Get("vpntorfeed")
 	go jbt.RegisterDeregister(config.Name, config.Port, exit)
-	logger.Log("Register attempted")
+	log.Print("Register attempted")
 
 	// get from nats
 	go func() {
 		client := &http.Client{Timeout: time.Second * 30}
 		sub, err := natsc.NewSubscriber(config.DB)
 		if err != nil {
-			exit <- true
+			<-exit
 			panic(err)
 		}
 		defer sub.Close()
@@ -34,17 +37,26 @@ func main() {
 			panic(err)
 		}
 		for msg := range ch {
-			logger.Logf("Topic %s received: %s\n", config.DB, msg)
+			log.Printf("Topic %s received: %s\n", config.DB, msg)
 			err := doReq(client, msg)
 			if err != nil {
-				logger.Log(err)
+				log.Print(err)
 			}
 		}
 	}()
 	//magnets <- "magnet:?xt=urn:btih:64b2b05f61d2b9ef3213fce9860fb45c844d77fb&dn=checkmyiptorrent&tr=http%3A%2F%2F34.204.227.31%2Fcheckmytorrentipaddress.php"
 
+	sigc := make(chan os.Signal)
+	signal.Notify(sigc,
+		syscall.SIGINT,
+	)
+	<-sigc
 	<-exit
-	logger.Log("Exit received")
+	select {
+	case <-exit:
+	case <-time.After(time.Second * 10):
+	}
+	log.Print("Exit received")
 }
 
 func getSessionID() string {
@@ -86,7 +98,7 @@ func doReq(client *http.Client, magnet string) error {
 		panic(err)
 	}
 
-	logger.Log(resp.StatusCode, magnet)
+	log.Print(resp.StatusCode, magnet)
 	if resp.StatusCode != 200 {
 		return errors.New("err failed request")
 	}