 55d8910255
			
		
	
	
	55d8910255
	
	
	
		
			
			urfave/cli v2 will eventually become unmaintained, switch over to v3 which is the latest supported version. Note: the `docs` command would be a lot of work to restore with v3 ([the package is still in alpha](https://github.com/urfave/cli-docs)) An alternative to avoid a breaking change would be to not upgrade from v2 to v3 for that reason alone. Note: these commits were cherry-picked from https://code.forgejo.org/forgefriends/forgefriends Note: it is best reviewed side by side with no display of whitespace changes (there are a lot of those when converting vars to func). - a few functional changes were necessary and are noted in context in the file changes tab - https://cli.urfave.org/migrate-v2-to-v3/ upgrade instructions were followed in the most minimal way possible - upgrade gof3 to v3.10.8 which includes and upgrade from urfave/cli v2 to urfave/cli v3 - upgrade gitlab.com/gitlab-org/api/client-go v0.129.0 because it is an indirect dependency of gof3 and requires a change because of a deprecated field that otherwise triggers a lint error but nothing else otherwise - verified that the [script](https://codeberg.org/forgejo/docs/src/branch/next/scripts/cli-docs.sh) that generates the [CLI documentation](https://codeberg.org/forgejo/docs/src/branch/next/scripts/cli-docs.sh) still works. There are cosmetic differences and the **help** subcommand is no longer advertised (although it is still supported) but the `--help` option is advertised as expected so it is fine. - end-to-end tests [passed](https://code.forgejo.org/forgejo/end-to-end/pulls/667) (they use the Forgejo CLI to some extent) ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] I do not want this change to show in the release notes. - [ ] I want the title to show in the release notes with a link to this pull request. - [x] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Breaking features - [PR](https://codeberg.org/forgejo/forgejo/pulls/8035): <!--number 8035 --><!--line 0 --><!--description VGhlIGBmb3JnZWpvIGRvY3NgIGNvbW1hbmQgaXMgZGVwcmVjYXRlZCBhbmQgQ0xJIGVycm9ycyBhcmUgbm93IGRpc3BsYXllZCBvbiBzdGRlcnIgaW5zdGVhZCBvZiBzdGRvdXQuIFRoZXNlIGJyZWFraW5nIGNoYW5nZXMgaGFwcGVuZWQgYmVjYXVzZSB0aGUgcGFja2FnZSB1c2VkIHRvIHBhcnNlIHRoZSBjb21tYW5kIGxpbmUgYXJndW1lbnRzIHdhcyBbdXBncmFkZWQgZnJvbSB2MiB0byB2M10oaHR0cHM6Ly9jbGkudXJmYXZlLm9yZy9taWdyYXRlLXYyLXRvLXYzLykuIEEgW3NlcGFyYXRlIHByb2plY3Qgd2FzIGluaXRpYXRlZF0oaHR0cHM6Ly9naXRodWIuY29tL3VyZmF2ZS9jbGktZG9jcykgdG8gcmUtaW1wbGVtZW50IHRoZSBgZG9jc2AgY29tbWFuZCwgYnV0IGl0IGlzIG5vdCB5ZXQgcHJvZHVjdGlvbiByZWFkeS4=-->The `forgejo docs` command is deprecated and CLI errors are now displayed on stderr instead of stdout. These breaking changes happened because the package used to parse the command line arguments was [upgraded from v2 to v3](https://cli.urfave.org/migrate-v2-to-v3/). A [separate project was initiated](https://github.com/urfave/cli-docs) to re-implement the `docs` command, but it is not yet production ready.<!--description--> <!--end release-notes-assistant--> Co-authored-by: limiting-factor <limiting-factor@posteo.com> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8035 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
		
			
				
	
	
		
			170 lines
		
	
	
	
		
			3.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			170 lines
		
	
	
	
		
			3.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2020 The Gitea Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package cmd
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"os"
 | |
| 	"time"
 | |
| 
 | |
| 	"forgejo.org/modules/private"
 | |
| 
 | |
| 	"github.com/urfave/cli/v3"
 | |
| )
 | |
| 
 | |
| // CmdManager represents the manager command
 | |
| func cmdManager() *cli.Command {
 | |
| 	return &cli.Command{
 | |
| 		Name:        "manager",
 | |
| 		Usage:       "Manage the running forgejo process",
 | |
| 		Description: "This is a command for managing the running forgejo process",
 | |
| 		Commands: []*cli.Command{
 | |
| 			subcmdShutdown(),
 | |
| 			subcmdRestart(),
 | |
| 			subcmdReloadTemplates(),
 | |
| 			subcmdFlushQueues(),
 | |
| 			subcmdLogging(),
 | |
| 			subCmdProcesses(),
 | |
| 		},
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func subcmdShutdown() *cli.Command {
 | |
| 	return &cli.Command{
 | |
| 		Name:  "shutdown",
 | |
| 		Usage: "Gracefully shutdown the running process",
 | |
| 		Flags: []cli.Flag{
 | |
| 			&cli.BoolFlag{
 | |
| 				Name: "debug",
 | |
| 			},
 | |
| 		},
 | |
| 		Action: runShutdown,
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func subcmdRestart() *cli.Command {
 | |
| 	return &cli.Command{
 | |
| 		Name:  "restart",
 | |
| 		Usage: "Gracefully restart the running process - (not implemented for windows servers)",
 | |
| 		Flags: []cli.Flag{
 | |
| 			&cli.BoolFlag{
 | |
| 				Name: "debug",
 | |
| 			},
 | |
| 		},
 | |
| 		Action: runRestart,
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func subcmdReloadTemplates() *cli.Command {
 | |
| 	return &cli.Command{
 | |
| 		Name:  "reload-templates",
 | |
| 		Usage: "Reload template files in the running process",
 | |
| 		Flags: []cli.Flag{
 | |
| 			&cli.BoolFlag{
 | |
| 				Name: "debug",
 | |
| 			},
 | |
| 		},
 | |
| 		Action: runReloadTemplates,
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func subcmdFlushQueues() *cli.Command {
 | |
| 	return &cli.Command{
 | |
| 		Name:   "flush-queues",
 | |
| 		Usage:  "Flush queues in the running process",
 | |
| 		Action: runFlushQueues,
 | |
| 		Flags: []cli.Flag{
 | |
| 			&cli.DurationFlag{
 | |
| 				Name:  "timeout",
 | |
| 				Value: 60 * time.Second,
 | |
| 				Usage: "Timeout for the flushing process",
 | |
| 			},
 | |
| 			&cli.BoolFlag{
 | |
| 				Name:  "non-blocking",
 | |
| 				Usage: "Set to true to not wait for flush to complete before returning",
 | |
| 			},
 | |
| 			&cli.BoolFlag{
 | |
| 				Name: "debug",
 | |
| 			},
 | |
| 		},
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func subCmdProcesses() *cli.Command {
 | |
| 	return &cli.Command{
 | |
| 		Name:   "processes",
 | |
| 		Usage:  "Display running processes within the current process",
 | |
| 		Action: runProcesses,
 | |
| 		Flags: []cli.Flag{
 | |
| 			&cli.BoolFlag{
 | |
| 				Name: "debug",
 | |
| 			},
 | |
| 			&cli.BoolFlag{
 | |
| 				Name:  "flat",
 | |
| 				Usage: "Show processes as flat table rather than as tree",
 | |
| 			},
 | |
| 			&cli.BoolFlag{
 | |
| 				Name:  "no-system",
 | |
| 				Usage: "Do not show system processes",
 | |
| 			},
 | |
| 			&cli.BoolFlag{
 | |
| 				Name:  "stacktraces",
 | |
| 				Usage: "Show stacktraces",
 | |
| 			},
 | |
| 			&cli.BoolFlag{
 | |
| 				Name:  "json",
 | |
| 				Usage: "Output as json",
 | |
| 			},
 | |
| 			&cli.StringFlag{
 | |
| 				Name:  "cancel",
 | |
| 				Usage: "Process PID to cancel. (Only available for non-system processes.)",
 | |
| 			},
 | |
| 		},
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func runShutdown(ctx context.Context, c *cli.Command) error {
 | |
| 	ctx, cancel := installSignals(ctx)
 | |
| 	defer cancel()
 | |
| 
 | |
| 	setup(ctx, c.Bool("debug"), false)
 | |
| 	extra := private.Shutdown(ctx)
 | |
| 	return handleCliResponseExtra(extra)
 | |
| }
 | |
| 
 | |
| func runRestart(ctx context.Context, c *cli.Command) error {
 | |
| 	ctx, cancel := installSignals(ctx)
 | |
| 	defer cancel()
 | |
| 
 | |
| 	setup(ctx, c.Bool("debug"), false)
 | |
| 	extra := private.Restart(ctx)
 | |
| 	return handleCliResponseExtra(extra)
 | |
| }
 | |
| 
 | |
| func runReloadTemplates(ctx context.Context, c *cli.Command) error {
 | |
| 	ctx, cancel := installSignals(ctx)
 | |
| 	defer cancel()
 | |
| 
 | |
| 	setup(ctx, c.Bool("debug"), false)
 | |
| 	extra := private.ReloadTemplates(ctx)
 | |
| 	return handleCliResponseExtra(extra)
 | |
| }
 | |
| 
 | |
| func runFlushQueues(ctx context.Context, c *cli.Command) error {
 | |
| 	ctx, cancel := installSignals(ctx)
 | |
| 	defer cancel()
 | |
| 
 | |
| 	setup(ctx, c.Bool("debug"), false)
 | |
| 	extra := private.FlushQueues(ctx, c.Duration("timeout"), c.Bool("non-blocking"))
 | |
| 	return handleCliResponseExtra(extra)
 | |
| }
 | |
| 
 | |
| func runProcesses(ctx context.Context, c *cli.Command) error {
 | |
| 	ctx, cancel := installSignals(ctx)
 | |
| 	defer cancel()
 | |
| 
 | |
| 	setup(ctx, c.Bool("debug"), false)
 | |
| 	extra := private.Processes(ctx, os.Stdout, c.Bool("flat"), c.Bool("no-system"), c.Bool("stacktraces"), c.Bool("json"), c.String("cancel"))
 | |
| 	return handleCliResponseExtra(extra)
 | |
| }
 |