github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-22 00:24:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Server obtain remote from glob config not from context (#540)

Browse Source
This commit is contained in:
6543
2021-11-26 13:01:54 +01:00
committed by GitHub
parent 8b476e7722
commit 5e6b38e0e7
13 changed files with 29 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/server/server.go
View File

@@ -98,7 +98,7 @@ func run(c *cli.Context) error {
)
}
remote_, err := SetupRemote(c)
remote_, err := setupRemote(c)
if err != nil {
log.Fatal().Err(err).Msg("")
}
@@ -142,7 +142,6 @@ func run(c *cli.Context) error {
middleware.Version,
middleware.Config(c),
middleware.Store(c, store_),
middleware.Remote(remote_),
)
var g errgroup.Group
@@ -253,6 +252,9 @@ func setupEvilGlobals(c *cli.Context, v store.Store, r remote.Remote) {
server.Config.Storage.Files = v
server.Config.Storage.Config = v
// remote
server.Config.Services.Remote = r
// services
server.Config.Services.Queue = setupQueue(c, v)
server.Config.Services.Logs = logging.New()

4
cmd/server/setup.go
View File

@@ -175,8 +175,8 @@ func setupEnvironService(c *cli.Context, s store.Store) model.EnvironService {
return environments.Filesystem(c.StringSlice("environment"))
}
// SetupRemote helper function to setup the remote from the CLI arguments.
func SetupRemote(c *cli.Context) (remote.Remote, error) {
// setupRemote helper function to setup the remote from the CLI arguments.
func setupRemote(c *cli.Context) (remote.Remote, error) {
switch {
case c.Bool("github"):
return setupGithub(c)