archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-13 20:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make log messages more uniform.

Browse source
This commit is contained in:
David Fifield 2017-01-20 09:41:24 -08:00
parent 21e27d3b3c
commit aa204af6b1
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/server.go
View file

@ -142,7 +142,7 @@ func webSocketHandler(ws *websocket.WebSocket) {
// the client. See https://bugs.torproject.org/18628. // the client. See https://bugs.torproject.org/18628.
or, err := pt.DialOr(&ptInfo, "", ptMethodName) or, err := pt.DialOr(&ptInfo, "", ptMethodName)
if err != nil { if err != nil {
log.Printf("Failed to connect to ORPort: " + err.Error()) log.Printf("failed to connect to ORPort: %s", err)
return return
} }
defer or.Close() defer or.Close()
@ -210,7 +210,7 @@ func startServer(ln net.Listener) (net.Listener, error) {
} }
err := s.Serve(ln) err := s.Serve(ln)
if err != nil { if err != nil {
log.Printf("http.Serve: " + err.Error()) log.Printf("http.Serve: %s", err)
} }
}() }()
return ln, nil return ln, nil
@ -232,18 +232,18 @@ func main() {
if logFilename != "" { if logFilename != "" {
f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
if err != nil { if err != nil {
log.Fatalf("Can't open log file %q: %s.", logFilename, err.Error()) log.Fatalf("can't open log file: %s", err)
} }
log.SetOutput(f) log.SetOutput(f)
} }
if disableTLS { if disableTLS {
if certFilename != "" || keyFilename != "" { if certFilename != "" || keyFilename != "" {
log.Fatalf("The --cert and --key options are not allowed with --disable-tls.\n") log.Fatalf("the --cert and --key options are not allowed with --disable-tls")
} }
} else { } else {
if certFilename == "" || keyFilename == "" { if certFilename == "" || keyFilename == "" {
log.Fatalf("The --cert and --key options are required.\n") log.Fatalf("the --cert and --key options are required")
} }
} }
@ -292,7 +292,7 @@ func main() {
} }
// signal received, shut down // signal received, shut down
log.Printf("Caught signal %q, exiting.", sig) log.Printf("caught signal %q, exiting", sig)
for _, ln := range listeners { for _, ln := range listeners {
ln.Close() ln.Close()
} }