diff options
author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-07-07 16:35:37 +0200 |
---|---|---|
committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-07-07 16:35:37 +0200 |
commit | 51fe7f28f9de3f36198ecb72726b84f16e205893 (patch) | |
tree | 832179ca6ea3345b01c271f9e98d2cca52155c92 | |
parent | 3c1e631641b144017c8c1639abf48aaa9bcd49b9 (diff) | |
download | gitlab-shell-51fe7f28f9de3f36198ecb72726b84f16e205893.tar.gz |
don't make up exitCodes
-rw-r--r-- | go/internal/handler/receive_pack.go | 6 | ||||
-rw-r--r-- | go/internal/handler/upload_pack.go | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/go/internal/handler/receive_pack.go b/go/internal/handler/receive_pack.go index ee55780..691af64 100644 --- a/go/internal/handler/receive_pack.go +++ b/go/internal/handler/receive_pack.go @@ -14,7 +14,7 @@ import ( func ReceivePack(gitalyAddress string, request *pb.SSHReceivePackRequest) (int32, error) { if gitalyAddress == "" { - return -1, fmt.Errorf("no gitaly_address given") + return 0, fmt.Errorf("no gitaly_address given") } connOpts := client.DefaultDialOpts @@ -24,11 +24,11 @@ func ReceivePack(gitalyAddress string, request *pb.SSHReceivePackRequest) (int32 conn, err := client.Dial(gitalyAddress, connOpts) if err != nil { - return -1, err + return 0, err } defer conn.Close() - ctx, cancel := context.WithCancel(context.TODO()) + ctx, cancel := context.WithCancel(context.Background()) defer cancel() return client.ReceivePack(ctx, conn, os.Stdin, os.Stdout, os.Stderr, request) } diff --git a/go/internal/handler/upload_pack.go b/go/internal/handler/upload_pack.go index b7e81f0..e2cff11 100644 --- a/go/internal/handler/upload_pack.go +++ b/go/internal/handler/upload_pack.go @@ -14,7 +14,7 @@ import ( func UploadPack(gitalyAddress string, request *pb.SSHUploadPackRequest) (int32, error) { if gitalyAddress == "" { - return -1, fmt.Errorf("no gitaly_address given") + return 0, fmt.Errorf("no gitaly_address given") } connOpts := client.DefaultDialOpts @@ -24,11 +24,11 @@ func UploadPack(gitalyAddress string, request *pb.SSHUploadPackRequest) (int32, conn, err := client.Dial(gitalyAddress, connOpts) if err != nil { - return -1, err + return 0, err } defer conn.Close() - ctx, cancel := context.WithCancel(context.TODO()) + ctx, cancel := context.WithCancel(context.Background()) defer cancel() return client.UploadPack(ctx, conn, os.Stdin, os.Stdout, os.Stderr, request) } |