forked from Deuxfleurs/bagage
Better error management
This commit is contained in:
parent
e10f04c5e3
commit
a171e84189
3 changed files with 9 additions and 2 deletions
3
.dockerignore
Normal file
3
.dockerignore
Normal file
|
@ -0,0 +1,3 @@
|
|||
s3_cache
|
||||
.git
|
||||
bagage
|
|
@ -2,7 +2,8 @@ FROM golang:1.17.0-alpine3.14 as builder
|
|||
ENV CGO_ENABLED=0 GOOS=linux GOARCH=amd64
|
||||
RUN apk update && apk add --no-cache ca-certificates && update-ca-certificates
|
||||
WORKDIR /opt
|
||||
COPY *.go go.mod go.sum /opt/
|
||||
COPY . /opt/
|
||||
RUN ls /opt/
|
||||
RUN go build .
|
||||
|
||||
FROM scratch
|
||||
|
|
5
main.go
5
main.go
|
@ -97,6 +97,7 @@ func handleSSHConn(nConn net.Conn, dconfig *Config, config *ssh.ServerConfig) {
|
|||
serverConn, chans, reqs, err := ssh.NewServerConn(nConn, config)
|
||||
if err != nil {
|
||||
log.Printf("failed to handshake: ", err)
|
||||
return
|
||||
}
|
||||
defer serverConn.Conn.Close()
|
||||
user := serverConn.Conn.User()
|
||||
|
@ -120,6 +121,7 @@ func handleSSHConn(nConn net.Conn, dconfig *Config, config *ssh.ServerConfig) {
|
|||
channel, requests, err := newChannel.Accept()
|
||||
if err != nil {
|
||||
log.Print("could not accept channel.", err)
|
||||
return
|
||||
}
|
||||
log.Printf("Channel accepted\n")
|
||||
|
||||
|
@ -155,7 +157,8 @@ func handleSSHConn(nConn net.Conn, dconfig *Config, config *ssh.ServerConfig) {
|
|||
server, err := sftp.NewServer(ctx, channel, &fs)
|
||||
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Println(err)
|
||||
return
|
||||
}
|
||||
|
||||
if err := server.Serve(); err == io.EOF {
|
||||
|
|
Loading…
Reference in a new issue