diff options
| author | Paul Buetow <git@mx.buetow.org> | 2021-03-23 20:51:32 +0000 |
|---|---|---|
| committer | Paul Buetow <git@mx.buetow.org> | 2021-03-23 20:51:32 +0000 |
| commit | 93fce245564ffde20c3e5113757bc65672f69ed5 (patch) | |
| tree | 4e75a996ef44bc5adc771c318753b0c4ad934269 | |
| parent | c5f3bd21f6bbb013b1890d7f3432d95c596abdda (diff) | |
add missing options package
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | docker/spinup.sh | 3 | ||||
| -rw-r--r-- | internal/options/options.go | 3 | ||||
| -rw-r--r-- | internal/server/server.go | 5 |
4 files changed, 10 insertions, 2 deletions
@@ -7,3 +7,4 @@ /dmap /dserver /bin +serverlist.txt diff --git a/docker/spinup.sh b/docker/spinup.sh index 3890ce6..0625967 100755 --- a/docker/spinup.sh +++ b/docker/spinup.sh @@ -3,7 +3,10 @@ declare -i NUM_INSTANCES=$1 declare -i BASE_PORT=2222 +echo > serverlist.txt + for (( i=0; i < $NUM_INSTANCES; i++ )); do port=$[ BASE_PORT + i + 1 ] docker run -d --name dserver-serv$i --hostname serv$i -p $port:2222 dserver:develop + echo localhost:$port >> serverlist.txt done diff --git a/internal/options/options.go b/internal/options/options.go new file mode 100644 index 0000000..816ddc9 --- /dev/null +++ b/internal/options/options.go @@ -0,0 +1,3 @@ +package options + +type Options map[string]string diff --git a/internal/server/server.go b/internal/server/server.go index a20737e..73822d5 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -141,7 +141,7 @@ func (s *Server) handleChannel(ctx context.Context, sshConn gossh.Conn, newChann } if err := s.handleRequests(ctx, sshConn, requests, channel, user); err != nil { - logger.Error(user, err) + logger.Error(user, "While handling request", err) sshConn.Close() } } @@ -190,7 +190,8 @@ func (s *Server) handleRequests(ctx context.Context, sshConn gossh.Conn, in <-ch go func() { if err := sshConn.Wait(); err != nil && err != io.EOF { - logger.Error(user, err) + // Use of closed network connection. + logger.Debug(user, "While waiting for ssh connection", err) } s.stats.decrementConnections() logger.Info(user, "Good bye Mister!") |
