Skip to content
This repository was archived by the owner on Mar 28, 2022. It is now read-only.

Commit 746f72c

Browse files
authored
Merge pull request #169 from seknox/fix-166
changed "/var/trasa/minio" to "/var/trasa/sessions"
2 parents af99603 + 0019d2f commit 746f72c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ jobs:
3535

3636
- name: Create required directories
3737
run: |
38-
sudo mkdir -p /var/trasa/minio
39-
sudo chmod 777 /var/trasa/minio
38+
sudo mkdir -p /var/trasa/sessions
39+
sudo chmod 777 /var/trasa/sessions
4040
sudo mkdir -p /tmp/trasa/accessproxy/http
4141
sudo chmod 777 /tmp/trasa/accessproxy/http
4242
sudo mkdir -p /tmp/trasa/accessproxy/guac

server/api/logs/store.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ func (s logStore) GetFromMinio(path, bucketName string) (object io.ReadSeeker, e
347347
return s.MinioClient.GetObject(bucketName, path, minio.GetObjectOptions{})
348348
}
349349

350-
filename := filepath.Join(utils.GetVarDir(), "trasa", "minio", bucketName, path)
350+
filename := filepath.Join(utils.GetVarDir(), "trasa", "sessions", bucketName, path)
351351
return os.OpenFile(filename, os.O_RDONLY, os.ModePerm)
352352
}
353353

@@ -357,7 +357,7 @@ func (s logStore) PutIntoMinio(objectName, logfilepath, bucketName string) error
357357
_, err := s.MinioClient.FPutObject(bucketName, objectName, logfilepath, minio.PutObjectOptions{})
358358
return err
359359
}
360-
newpath := filepath.Join(utils.GetVarDir(), "trasa", "minio", bucketName, objectName)
360+
newpath := filepath.Join(utils.GetVarDir(), "trasa", "sessions", bucketName, objectName)
361361
dir, _ := filepath.Split(newpath)
362362
err := os.MkdirAll(dir, os.ModePerm)
363363
if err != nil {

server/global/global.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ func checkInitDirsAndFiles() {
362362
if err != nil {
363363
panic(err)
364364
}
365-
err = os.MkdirAll(filepath.Join(utils.GetVarDir(), "trasa", "minio"), 0600)
365+
err = os.MkdirAll(filepath.Join(utils.GetVarDir(), "trasa", "sessions"), 0600)
366366
if err != nil {
367367
panic(err)
368368
}

0 commit comments

Comments
 (0)