mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-04-26 13:34:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'origin/main' into 'next-release/main'

Browse source
This commit is contained in:
oauth 2025-01-05 11:49:52 +00:00
commit d99e56b897
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/server/server.go
View file

@ -111,8 +111,6 @@ func run(ctx context.Context, c *cli.Command) error {
log.Info().Msgf("starting Woodpecker server with version '%s'", version.String()) log.Info().Msgf("starting Woodpecker server with version '%s'", version.String())
startMetricsCollector(ctx, _store)
serviceWaitingGroup.Go(func() error { serviceWaitingGroup.Go(func() error {
log.Info().Msg("starting cron service ...") log.Info().Msg("starting cron service ...")
if err := cron.Run(ctx, _store); err != nil { if err := cron.Run(ctx, _store); err != nil {
@ -260,6 +258,8 @@ func run(ctx context.Context, c *cli.Command) error {
} }
if metricsServerAddr := c.String("metrics-server-addr"); metricsServerAddr != "" { if metricsServerAddr := c.String("metrics-server-addr"); metricsServerAddr != "" {
startMetricsCollector(ctx, _store)
serviceWaitingGroup.Go(func() error { serviceWaitingGroup.Go(func() error {
metricsRouter := gin.New() metricsRouter := gin.New()
metricsRouter.GET("/metrics", gin.WrapH(prometheus_http.Handler())) metricsRouter.GET("/metrics", gin.WrapH(prometheus_http.Handler()))

12
server/forge/addon/args.go
View file

@ -110,6 +110,9 @@ type modelUser struct {
} }
func (m *modelUser) asModel() *model.User { func (m *modelUser) asModel() *model.User {
if m == nil {
return nil
}
m.User.ForgeRemoteID = m.ForgeRemoteID m.User.ForgeRemoteID = m.ForgeRemoteID
m.User.AccessToken = m.Token m.User.AccessToken = m.Token
m.User.RefreshToken = m.Secret m.User.RefreshToken = m.Secret
@ -119,6 +122,9 @@ func (m *modelUser) asModel() *model.User {
} }
func modelUserFromModel(u *model.User) *modelUser { func modelUserFromModel(u *model.User) *modelUser {
if u == nil {
return nil
}
return &modelUser{ return &modelUser{
User: u, User: u,
ForgeRemoteID: u.ForgeRemoteID, ForgeRemoteID: u.ForgeRemoteID,
@ -138,6 +144,9 @@ type modelRepo struct {
} }
func (m *modelRepo) asModel() *model.Repo { func (m *modelRepo) asModel() *model.Repo {
if m == nil {
return nil
}
m.Repo.UserID = m.UserID m.Repo.UserID = m.UserID
m.Repo.Hash = m.Hash m.Repo.Hash = m.Hash
m.Repo.Perm = m.Perm m.Repo.Perm = m.Perm
@ -145,6 +154,9 @@ func (m *modelRepo) asModel() *model.Repo {
} }
func modelRepoFromModel(r *model.Repo) *modelRepo { func modelRepoFromModel(r *model.Repo) *modelRepo {
if r == nil {
return nil
}
return &modelRepo{ return &modelRepo{
Repo: r, Repo: r,
UserID: r.UserID, UserID: r.UserID,