X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-server%2Fproxy.go;h=02c1f0f53addb30708cdace82e756c8edc71ed26;hb=4cc7cf27a64355bbe1f64418a55e860baeb63ac0;hp=bcfd882c40e4e8c94b3db7b6fe8ab89ac3634c35;hpb=649e55e1ead338121ea76d6ae1187617ea9839d6;p=govpn.git

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/proxy.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/proxy.go
index bcfd882..02c1f0f 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/proxy.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/proxy.go
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-	"log"
 	"net/http"
 
 	"cypherpunks.ru/govpn"
@@ -30,7 +29,7 @@ type proxyHandler struct{}
 func (p proxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	conn, _, err := w.(http.Hijacker).Hijack()
 	if err != nil {
-		govpn.Println("Hijacking failed:", err.Error())
+		govpn.Printf(`[proxy-hijack-failed bind="%s" err="%s"]`, *bindAddr, err)
 		return
 	}
 	conn.Write([]byte("HTTP/1.0 200 OK\n\n"))
@@ -38,12 +37,10 @@ func (p proxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 func proxyStart() {
-	log.Println("HTTP proxy listening on:" + *proxy)
-	govpn.Println("HTTP proxy listening on:" + *proxy)
+	govpn.BothPrintf(`[proxy-listen bind="%s" addr="%s"]`, *bindAddr, *proxy)
 	s := &http.Server{
 		Addr:    *proxy,
 		Handler: proxyHandler{},
 	}
-	log.Println("HTTP proxy result:", s.ListenAndServe())
-	govpn.Println("HTTP proxy result:", s.ListenAndServe())
+	govpn.BothPrintf(`[proxy-finished bind="%s" result="%s"]`, *bindAddr, s.ListenAndServe())
 }