Browse Source

Log web server listening address

Rod Hynes 9 years ago
parent
commit
3512632abf
1 changed files with 10 additions and 7 deletions
  1. 10 7
      psiphon/server/webServer.go

+ 10 - 7
psiphon/server/webServer.go

@@ -100,15 +100,16 @@ func RunWebServer(
 		},
 		},
 	}
 	}
 
 
-	listener, err := net.Listen(
-		"tcp", fmt.Sprintf("%s:%d",
-			support.Config.ServerIPAddress,
-			support.Config.WebServerPort))
+	localAddress := fmt.Sprintf("%s:%d",
+		support.Config.ServerIPAddress, support.Config.WebServerPort)
+
+	listener, err := net.Listen("tcp", localAddress)
 	if err != nil {
 	if err != nil {
 		return common.ContextError(err)
 		return common.ContextError(err)
 	}
 	}
 
 
-	log.WithContext().Info("starting")
+	log.WithContextFields(
+		LogFields{"localAddress": localAddress}).Info("starting")
 
 
 	err = nil
 	err = nil
 	errors := make(chan error)
 	errors := make(chan error)
@@ -135,7 +136,8 @@ func RunWebServer(
 			}
 			}
 		}
 		}
 
 
-		log.WithContext().Info("stopped")
+		log.WithContextFields(
+			LogFields{"localAddress": localAddress}).Info("stopped")
 	}()
 	}()
 
 
 	select {
 	select {
@@ -147,7 +149,8 @@ func RunWebServer(
 
 
 	waitGroup.Wait()
 	waitGroup.Wait()
 
 
-	log.WithContext().Info("exiting")
+	log.WithContextFields(
+		LogFields{"localAddress": localAddress}).Info("exiting")
 
 
 	return err
 	return err
 }
 }