Align CLI manager naming with AX
This commit is contained in:
parent
a675d16ed6
commit
ba0d61d4bc
8 changed files with 17 additions and 17 deletions
|
|
@ -65,7 +65,7 @@ var installCmd = &cobra.Command{
|
|||
}
|
||||
|
||||
func updateDoctorCache() error {
|
||||
manager := getServiceManager()
|
||||
manager := getManager()
|
||||
availableMiners := manager.ListAvailableMiners()
|
||||
if len(availableMiners) == 0 {
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ var listCmd = &cobra.Command{
|
|||
Short: "List running and available miners",
|
||||
Long: `List all running miners and their status, as well as all miners that are available to be installed and started.`,
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
manager := getServiceManager()
|
||||
manager := getManager()
|
||||
|
||||
// List running miners
|
||||
runningMiners := manager.ListMiners()
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import (
|
|||
)
|
||||
|
||||
var (
|
||||
serviceManager *mining.Manager
|
||||
manager *mining.Manager
|
||||
)
|
||||
|
||||
var rootCmd = &cobra.Command{
|
||||
|
|
@ -24,21 +24,21 @@ func Execute() error {
|
|||
}
|
||||
|
||||
func init() {
|
||||
cobra.OnInitialize(initializeServiceManager)
|
||||
cobra.OnInitialize(initializeManager)
|
||||
}
|
||||
|
||||
func initializeServiceManager() {
|
||||
func initializeManager() {
|
||||
if len(os.Args) > 1 && os.Args[1] == "simulate" {
|
||||
return
|
||||
}
|
||||
if serviceManager == nil {
|
||||
serviceManager = mining.NewManager()
|
||||
if manager == nil {
|
||||
manager = mining.NewManager()
|
||||
}
|
||||
}
|
||||
|
||||
func getServiceManager() *mining.Manager {
|
||||
if serviceManager == nil {
|
||||
serviceManager = mining.NewManager()
|
||||
func getManager() *mining.Manager {
|
||||
if manager == nil {
|
||||
manager = mining.NewManager()
|
||||
}
|
||||
return serviceManager
|
||||
return manager
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ var serveCmd = &cobra.Command{
|
|||
displayAddress := fmt.Sprintf("%s:%d", displayHostName, port)
|
||||
listenAddress := fmt.Sprintf("%s:%d", host, port)
|
||||
|
||||
// manager := getServiceManager() shares the same miner lifecycle state across CLI commands.
|
||||
manager := getServiceManager()
|
||||
// manager := getManager() shares the same miner lifecycle state across CLI commands.
|
||||
manager := getManager()
|
||||
|
||||
service, err := mining.NewService(manager, listenAddress, displayAddress, namespace)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ var startCmd = &cobra.Command{
|
|||
Wallet: walletAddress,
|
||||
}
|
||||
|
||||
miner, err := getServiceManager().StartMiner(context.Background(), minerType, config)
|
||||
miner, err := getManager().StartMiner(context.Background(), minerType, config)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to start miner: %w", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ var statusCmd = &cobra.Command{
|
|||
Args: cobra.ExactArgs(1),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
minerName := args[0]
|
||||
manager := getServiceManager()
|
||||
manager := getManager()
|
||||
|
||||
miner, err := manager.GetMiner(minerName)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ var stopCmd = &cobra.Command{
|
|||
Args: cobra.ExactArgs(1),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
minerName := args[0]
|
||||
manager := getServiceManager()
|
||||
manager := getManager()
|
||||
|
||||
if err := manager.StopMiner(context.Background(), minerName); err != nil {
|
||||
return fmt.Errorf("failed to stop miner: %w", err)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ var uninstallCmd = &cobra.Command{
|
|||
Args: cobra.ExactArgs(1),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
minerType := args[0]
|
||||
manager := getServiceManager() // getServiceManager() returns the shared manager used by `mining uninstall`.
|
||||
manager := getManager() // getManager() returns the shared manager used by `mining uninstall`.
|
||||
|
||||
fmt.Printf("Uninstalling %s...\n", minerType)
|
||||
if err := manager.UninstallMiner(context.Background(), minerType); err != nil {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue