Merge pull request 'fix(f3): do not run the F3 CLI if F3 is disabled' (#4148) from earl-warren/forgejo:wip-f3 into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4148 Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
This commit is contained in:
commit
133d62a2ef
|
@ -6,10 +6,12 @@ package forgejo
|
|||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
|
||||
"code.gitea.io/gitea/models"
|
||||
"code.gitea.io/gitea/modules/git"
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
"code.gitea.io/gitea/modules/storage"
|
||||
"code.gitea.io/gitea/services/f3/util"
|
||||
|
||||
|
@ -41,6 +43,11 @@ func SubcmdF3Mirror(ctx context.Context) *cli.Command {
|
|||
}
|
||||
|
||||
func runMirror(ctx context.Context, c *cli.Context, action cli.ActionFunc) error {
|
||||
setting.LoadF3Setting()
|
||||
if !setting.F3.Enabled {
|
||||
return errors.New("F3 is disabled, it is not ready to be used and is only present for development purposes")
|
||||
}
|
||||
|
||||
var cancel context.CancelFunc
|
||||
if !ContextGetNoInit(ctx) {
|
||||
ctx, cancel = installSignals(ctx)
|
||||
|
|
|
@ -15,6 +15,10 @@ var (
|
|||
}
|
||||
)
|
||||
|
||||
func LoadF3Setting() {
|
||||
loadF3From(CfgProvider)
|
||||
}
|
||||
|
||||
func loadF3From(rootCfg ConfigProvider) {
|
||||
if err := rootCfg.Section("F3").MapTo(&F3); err != nil {
|
||||
log.Fatal("Failed to map F3 settings: %v", err)
|
||||
|
|
|
@ -10,6 +10,8 @@ import (
|
|||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/cmd/forgejo"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
"code.gitea.io/gitea/modules/test"
|
||||
"code.gitea.io/gitea/services/f3/driver/options"
|
||||
"code.gitea.io/gitea/tests"
|
||||
|
||||
|
@ -56,6 +58,7 @@ func runApp(ctx context.Context, args ...string) (string, error) {
|
|||
|
||||
func TestF3_CmdMirror_LocalForgejo(t *testing.T) {
|
||||
defer tests.PrepareTestEnv(t)()
|
||||
defer test.MockVariableValue(&setting.F3.Enabled, true)()
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
|
|
Loading…
Reference in New Issue