github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-17 09:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix so always returns

Browse Source
This commit is contained in:
Robert Lippens 2019-08-13 21:41:36 -07:00
parent 9bf84349d0
commit 22d2e9db30
No known key found for this signature in database
GPG Key ID: 9984DABBD3F82E8F
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/drone-server/inject_store.go
View File

@ -83,9 +83,16 @@ func provideBuildStore(db *db.DB) core.BuildStore {
func provideLogStore(db *db.DB, config config.Config) core.LogStore { func provideLogStore(db *db.DB, config config.Config) core.LogStore {
if config.S3.Bucket == "" && config.AzureBlob.ContainerName == "" { if config.S3.Bucket == "" && config.AzureBlob.ContainerName == "" {
return logs.New(db) return logs.New(db)
} } else if config.AzureBlob.ContainerName != "" {
s := logs.New(db) s := logs.New(db)
if config.S3.Bucket != "" { p := logs.NewAzureBlobEnv(
config.AzureBlob.ContainerName,
config.AzureBlob.StorageAccountName,
config.AzureBlob.StorageAccessKey,
)
return logs.NewCombined(p, s)
} else {
s := logs.New(db)
p := logs.NewS3Env( p := logs.NewS3Env(
config.S3.Bucket, config.S3.Bucket,
config.S3.Prefix, config.S3.Prefix,
@ -94,15 +101,6 @@ func provideLogStore(db *db.DB, config config.Config) core.LogStore {
) )
return logs.NewCombined(p, s) return logs.NewCombined(p, s)
} }
if config.AzureBlob.ContainerName != "" {
p := logs.NewAzureBlobEnv(
config.AzureBlob.ContainerName,
config.AzureBlob.StorageAccountName,
config.AzureBlob.StorageAccessKey,
)
return logs.NewCombined(p, s)
}
} }
// provideStageStore is a Wire provider function that provides a // provideStageStore is a Wire provider function that provides a