From 17e70a908ece1ae5519e42cb467e82c7d735e088 Mon Sep 17 00:00:00 2001
From: polinasok <51177946+polinasok@users.noreply.github.com>
Date: Mon, 9 Mar 2020 10:14:34 -0700
Subject: [PATCH] logflags: Add pid to server-listening-at message (#1885)

* logflags: Add pid to server-listening-at message

* Address review comments: use logger

Co-authored-by: Polina Sokolova <polinasok@users.noreply.github.com>
---
 pkg/logflags/logflags.go    | 5 +++--
 service/dap/server.go       | 2 ++
 service/rpccommon/server.go | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkg/logflags/logflags.go b/pkg/logflags/logflags.go
index 9ad2dd0e..a066bed8 100644
--- a/pkg/logflags/logflags.go
+++ b/pkg/logflags/logflags.go
@@ -122,10 +122,11 @@ func WriteAPIListeningMessage(addr string) {
 }
 
 func writeListeningMessage(server string, addr string) {
+        msg := fmt.Sprintf("%s server listening at: %s", server, addr)
 	if logOut != nil {
-		fmt.Fprintf(logOut, "%s server listening at: %s\n", server, addr)
+		fmt.Fprintln(logOut, msg)
 	} else {
-		fmt.Printf("%s server listening at: %s\n", server, addr)
+		fmt.Println(msg)
 	}
 }
 
diff --git a/service/dap/server.go b/service/dap/server.go
index 83b68e70..c9931ae9 100644
--- a/service/dap/server.go
+++ b/service/dap/server.go
@@ -14,6 +14,7 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"os"
 	"path/filepath"
 
 	"github.com/go-delve/delve/pkg/gobuild"
@@ -64,6 +65,7 @@ type Server struct {
 func NewServer(config *service.Config) *Server {
 	logger := logflags.DAPLogger()
 	logflags.WriteDAPListeningMessage(config.Listener.Addr().String())
+	logger.Debug("DAP server pid = ", os.Getpid())
 	return &Server{
 		config:   config,
 		listener: config.Listener,
diff --git a/service/rpccommon/server.go b/service/rpccommon/server.go
index 7510b88e..edae8586 100644
--- a/service/rpccommon/server.go
+++ b/service/rpccommon/server.go
@@ -9,6 +9,7 @@ import (
 	"net"
 	"net/rpc"
 	"net/rpc/jsonrpc"
+	"os"
 	"reflect"
 	"runtime"
 	"sync"
@@ -74,6 +75,7 @@ func NewServer(config *service.Config) *ServerImpl {
 	if config.Foreground {
 		// Print listener address
 		logflags.WriteAPIListeningMessage(config.Listener.Addr().String())
+		logger.Debug("API server pid = ", os.Getpid())
 	}
 	return &ServerImpl{
 		config:   config,