No more vendor or logger

oldmain.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"local/logger"
+	"log"
 	"net"
 	"net/http"
 	"net/http/httputil"
@@ -88,25 +88,25 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	fixScheme(r)
 	// if not from localhost
 	if !fromLocalhost(r.RemoteAddr) {
-		logger.Log("Denying non-localhost", r.RemoteAddr)
+		log.Print("Denying non-localhost", r.RemoteAddr)
 		denyAccess(w)
 		return
 	}
 	if !toWhitelist(s.whitelist, r.URL.Host) {
-		logger.Log("Denying non-whitelisted", r.URL.Host)
+		log.Print("Denying non-whitelisted", r.URL.Host)
 		denyAccess(w)
 		return
 	}
 	if toWhitelist(s.bypass, r.URL.Host) {
-		logger.Log("Bypassing", r.URL.String())
+		log.Print("Bypassing", r.URL.String())
 		s.passthrough(w, r)
 		return
 	}
 	if toWhitelist(s.secure, r.URL.Host) {
-		logger.Log("Securing", r.URL.String(), r.Host)
+		log.Print("Securing", r.URL.String(), r.Host)
 		r.URL.Scheme = "https"
 	}
-	//logger.Log("Proxying", r.URL.String(), r.Host, *r)
+	//log.Print("Proxying", r.URL.String(), r.Host, *r)
 	// proxy via stuncaddsies
 	s.handleHTTP(w, r)
 }
@@ -249,14 +249,14 @@ func oldmain() {
 	whitelist := strings.Split(conf["whitelist"], ",,")
 	bypass := strings.Split(conf["bypass"], ",,")
 	secure := strings.Split(conf["secure"], ",,")
-	logger.Log(conf)
+	log.Print(conf)
 	server, err := NewServer(conf["port"], conf["stunaddr"], conf["mecrt"], conf["mekey"], conf["tocrt"], conf["fromcrt"], append(whitelist, bypass...), bypass, secure)
 	if err != nil {
-		logger.Fatal(err)
+		log.Fatal(err)
 	}
 	if conf["fromcrt"] != "" {
-		logger.Fatal(server.server.ListenAndServeTLS(conf["mecrt"], conf["mekey"]))
+		log.Fatal(server.server.ListenAndServeTLS(conf["mecrt"], conf["mekey"]))
 	} else {
-		logger.Fatal(http.ListenAndServe(conf["port"], server))
+		log.Fatal(http.ListenAndServe(conf["port"], server))
 	}
 }