diff --git a/cmd/cmd.go b/cmd/cmd.go index fde914c..c6495ab 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -377,10 +377,9 @@ func New() *Cmd { options = append(options, server.RateLimit(v)) } - purgeDays := c.Int("purge-days") purgeInterval := c.Int("purge-interval") - if purgeDays > 0 && purgeInterval > 0 { + if purgeDays > 0 && purgeInterval > 0 { options = append(options, server.Purge(purgeDays, purgeInterval)) } diff --git a/server/server.go b/server/server.go index ff999b0..bff1ee9 100644 --- a/server/server.go +++ b/server/server.go @@ -194,7 +194,6 @@ func Purge(days, interval int) OptionFn { } } - func ForceHTTPs() OptionFn { return func(srvr *Server) { srvr.forceHTTPs = true @@ -288,8 +287,8 @@ type Server struct { maxUploadSize int64 rateLimitRequests int - purgeDays time.Duration - purgeInterval time.Duration + purgeDays time.Duration + purgeInterval time.Duration storage Storage diff --git a/server/storage.go b/server/storage.go index ab3c839..b96cfe4 100644 --- a/server/storage.go +++ b/server/storage.go @@ -158,12 +158,12 @@ func NewS3Storage(accessKey, secretKey, bucketName string, purgeDays int, region sess := getAwsSession(accessKey, secretKey, region, endpoint, forcePathStyle) return &S3Storage{ - bucket: bucketName, - s3: s3.New(sess), - session: sess, - logger: logger, + bucket: bucketName, + s3: s3.New(sess), + session: sess, + logger: logger, noMultipart: disableMultipart, - purgeDays: time.Duration(purgeDays * 24) * time.Hour, + purgeDays: time.Duration(purgeDays*24) * time.Hour, }, nil } @@ -274,9 +274,9 @@ func (s *S3Storage) Put(token string, filename string, reader io.Reader, content }) _, err = uploader.Upload(&s3manager.UploadInput{ - Bucket: aws.String(s.bucket), - Key: aws.String(key), - Body: reader, + Bucket: aws.String(s.bucket), + Key: aws.String(key), + Body: reader, Expires: aws.Time(time.Now().Add(s.purgeDays)), }) @@ -616,10 +616,10 @@ func saveGDriveToken(path string, token *oauth2.Token, logger *log.Logger) { type StorjStorage struct { Storage - project *uplink.Project - bucket *uplink.Bucket + project *uplink.Project + bucket *uplink.Bucket purgeDays time.Duration - logger *log.Logger + logger *log.Logger } func NewStorjStorage(access, bucket string, purgeDays int, logger *log.Logger) (*StorjStorage, error) { @@ -645,7 +645,7 @@ func NewStorjStorage(access, bucket string, purgeDays int, logger *log.Logger) ( return nil, err } - instance.purgeDays = time.Duration(purgeDays * 24) * time.Hour + instance.purgeDays = time.Duration(purgeDays*24) * time.Hour instance.logger = logger