diff --git a/client/operation.go b/client/operation.go index 0275eb9..3841df5 100644 --- a/client/operation.go +++ b/client/operation.go @@ -85,8 +85,13 @@ func zipLogFiles(req *shared.UploadRequest, start, except string) (string, []str return "", nil, nil } + for i, file := range matches { + file = filepath.ToSlash(file) + matches[i] = file + } + root = path.Join(root, path.Dir(req.Filter)) - zipFileName := path.Join(os.TempDir(), path.Base(matches[0]), ".zip") + zipFileName := path.Join(os.TempDir(), path.Base(matches[0])) + ".zip" f, err := os.OpenFile(zipFileName, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600) if err != nil { @@ -98,9 +103,7 @@ func zipLogFiles(req *shared.UploadRequest, start, except string) (string, []str defer w.Close() oldestFile := "" - for i, file := range matches { - file = filepath.ToSlash(file) - matches[i] = file + for _, file := range matches { if file == root { continue } diff --git a/go.mod b/go.mod index cf31a8f..2a3c5a4 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( golang.org/x/text v0.9.0 google.golang.org/grpc v1.55.0 google.golang.org/protobuf v1.30.0 - repositories.action2quare.com/ayo/gocommon v0.0.0-20230524061015-e95efa06a6d4 + repositories.action2quare.com/ayo/gocommon v0.0.0-20230528100715-93bd4f6c0bab ) require ( diff --git a/go.sum b/go.sum index 90afe2a..db1081c 100644 --- a/go.sum +++ b/go.sum @@ -148,5 +148,5 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -repositories.action2quare.com/ayo/gocommon v0.0.0-20230524061015-e95efa06a6d4 h1:DFrkLvbPWqwVDU4X0QGJs2lhPduJYJU+JM/r1L2RMwo= -repositories.action2quare.com/ayo/gocommon v0.0.0-20230524061015-e95efa06a6d4/go.mod h1:pw573a06qV7dP1lSyavbWmzyYAsmwtK6mdbFENbh3cs= +repositories.action2quare.com/ayo/gocommon v0.0.0-20230528100715-93bd4f6c0bab h1:EMlxwDayv3rn8ttJcJuDLYoHA5odVn85+LjdAuw+2dw= +repositories.action2quare.com/ayo/gocommon v0.0.0-20230528100715-93bd4f6c0bab/go.mod h1:ng62uGMGXyQSeuxePG5gJAMtip4Rnspu5Tu7hgvaXns= diff --git a/warehouse/0.0.5/@args b/warehouse/0.0.5/@args deleted file mode 100644 index ec31073..0000000 --- a/warehouse/0.0.5/@args +++ /dev/null @@ -1 +0,0 @@ -["././././warehouse.exe","-dev","-port=8090"] diff --git a/warehouse/0.0.5/errs/warehouse_2023-05-26T16-45-31.err b/warehouse/0.0.5/errs/warehouse_2023-05-26T16-45-31.err deleted file mode 100644 index 153a53f..0000000 --- a/warehouse/0.0.5/errs/warehouse_2023-05-26T16-45-31.err +++ /dev/null @@ -1 +0,0 @@ -2023/05/26 16:45:31 warehouse.exe 2023-05-26 16:11:31.7258831 +0900 KST