10000 Cleanup error messages in log by fosterseth · Pull Request #513 · ansible/receptor · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Cleanup error messages in log #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 19, 2022
Merged

Cleanup error messages in log #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 32 additions & 12 deletions pkg/controlsvc/controlsvc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,21 +123,27 @@ func (s *Server) AddControlFunc(name string, cType ControlCommandType) error {
return nil
}

func errorNormal(err error) bool {
return strings.HasSuffix(err.Error(), "normal close")
}

// RunControlSession runs the server protocol on the given connection.
func (s *Server) RunControlSession(conn net.Conn) {
logger.Info("Client connected to control service %s\n", conn.RemoteAddr().String())
logger.Debug("Client connected to control service %s\n", conn.RemoteAddr().String())
defer func() {
logger.Info("Client disconnected from control service %s\n", conn.RemoteAddr().String())
logger.Debug("Client disconnected from control service %s\n", conn.RemoteAddr().String())
if conn != nil {
err := conn.Close()
if err != nil {
logger.Error("Error closing connection: %s\n", err)
logger.Warning("Could not close connection: %s\n", err)
}
}
}()
_, err := conn.Write([]byte(fmt.Sprintf("Receptor Control, node %s\n", s.nc.NodeID())))
if err != nil {
logger.Error("Write error in control service: %s\n", err)
if !errorNormal(err) {
logger.Error("Could not write in control service: %s\n", err)
}

return
}
Expand All @@ -150,12 +156,14 @@ func (s *Server) RunControlSession(conn net.Conn) {
for {
n, err := conn.Read(buf)
if err == io.EOF {
logger.Info("Control service closed\n")
logger.Debug("Control service closed\n")
done = true

break
} else if err != nil {
logger.Error("Read error in control service: %s\n", err)
if !errorNormal(err) {
logger.Warning("Could not read in control service: %s\n", err)
}

return
}
Expand Down Expand Up @@ -190,7 +198,9 @@ func (s *Server) RunControlSession(conn net.Conn) {
if err != nil {
_, err = conn.Write([]byte(fmt.Sprintf("ERROR: %s\n", err)))
if err != nil {
logger.Error("Write error in control service: %s\n", err)
if !errorNormal(err) {
logger.Error("Write error in control service: %s\n", err)
}

return
}
Expand Down Expand Up @@ -231,10 +241,14 @@ func (s *Server) RunControlSession(conn net.Conn) {
cfr, err = cc.ControlFunc(ctx, s.nc, cfo)
}
if err != nil {
logger.Error(err.Error())
if !errorNormal(err) {
logger.Error(err.Error())
}
_, err = conn.Write([]byte(fmt.Sprintf("ERROR: %s\n", err)))
if err != nil {
logger.Error("Write error in control service: %s\n", err)< 10000 /td>
if !errorNormal(err) {
logger.Error("Write error in control service: %s\n", err)
}

return
}
Expand All @@ -243,23 +257,29 @@ func (s *Server) RunControlSession(conn net.Conn) {
if err != nil {
_, err = conn.Write([]byte(fmt.Sprintf("ERROR: could not convert response to JSON: %s\n", err)))
if err != nil {
logger.Error("Write error in control service: %s\n", err)
if !errorNormal(err) {
logger.Error("Write error in control service: %s\n", err)
}

return
}
}
rbytes = append(rbytes, '\n')
_, err = conn.Write(rbytes)
if err != nil {
logger.Error("Write error in control service: %s\n", err)
if !errorNormal(err) {
logger.Error("Write error in control service: %s\n", err)
}

return
}
}
} else {
_, err = conn.Write([]byte("ERROR: Unknown command\n"))
if err != nil {
logger.Error("Write error in control service: %s\n", err)
if !errorNormal(err) {
logger.Error("Write error in control service: %s\n", err)
}

return
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/netceptor/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ func monitorUnreachable(pc *PacketConn, doneChan chan struct{}, remoteAddr Addr,
// read from channel until closed
for msg := range msgCh {
if msg.Problem == ProblemServiceUnknown && msg.ToNode == remoteAddr.node && msg.ToService == remoteAddr.service {
logger.Error("remote service unreachable")
logger.Warning("remote service %s to node %s is unreachable", msg.ToService, msg.ToNode)
cancel()
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/pkg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type Receptor struct {
Controllers *controlsvc.Controllers `mapstructure:"controllers"`
}

// Serve launches an receptor instance and blocks until canceled or failed.
// Serve launches an receptor instance and blocks until cancelled or failed.
func (r Receptor) Serve(ctx context.Context) error {
logger.SetShowTrace(r.EnableTracing)

Expand Down
1 change: 1 addition & 0 deletions pkg/workceptor/controlsvc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ func (c *workceptorCommand) ControlFunc(ctx context.Context, nc *netceptor.Netce
if err != nil {
return nil, err
}

err = cfo.Close()
if err != nil {
return nil, err
Expand Down
10 changes: 8 additions & 2 deletions pkg/workceptor/remote_work.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func (rw *remoteUnit) getConnection(ctx context.Context) (net.Conn, *bufio.Reade
if err == nil {
return conn, reader
}
logger.Warning("Connection to %s failed with error: %s",
logger.Debug("Connection to %s failed with error: %s",
rw.Status().ExtraData.(*remoteExtraData).RemoteNode, err)
errStr := err.Error()
if strings.Contains(errStr, "CRYPTO_ERROR") {
Expand Down Expand Up @@ -470,7 +470,13 @@ func (rw *remoteUnit) monitorRemoteStdout(mw *utils.JobContext) {
_, err = io.Copy(stdout, conn)
close(doneChan)
if err != nil {
logger.Warning("Error copying to stdout file %s: %s\n", rw.stdoutFileName, err)
var errmsg string
if strings.HasSuffix(err.Error(), "error code 499") {
errmsg = "read operation cancelled"
} else {
errmsg = err.Error()
}
logger.Warning("Could not copy to stdout file %s: %s\n", rw.stdoutFileName, errmsg)

continue
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/workceptor/workceptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ func (w *Workceptor) GetResults(ctx context.Context, unitID string, startPos int
if err == io.EOF {
stdoutSize := stdoutSize(unitdir)
if IsComplete(unit.Status().State) && stdoutSize >= unit.Status().StdoutSize {
logger.Info("Stdout complete - closing channel for: %s \n", unitID)
logger.Debug("Stdout complete - closing channel for: %s \n", unitID)

return
}
Expand Down
0