From 99b938d9b62c00011575271f400742f0803572b4 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong (cubxxw)" <3293172751nss@gmail.com> Date: Thu, 29 Feb 2024 11:49:41 +0800 Subject: [PATCH] feat: fix openim tools error code --- pkg/common/cmd/root.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go index 27b12d040..17e23a074 100644 --- a/pkg/common/cmd/root.go +++ b/pkg/common/cmd/root.go @@ -140,7 +140,7 @@ func (r *RootCmd) getPortFlag(cmd *cobra.Command) (int, error) { return 0, errors.Wrap(err, "error getting port flag") } if port == 0 { - port = r.PortFromConfig(constant.FlagPort) + port, _ = r.PortFromConfig(constant.FlagPort) // port, err := r.PortFromConfig(constant.FlagPort) // if err != nil { // // Optionally wrap the error if it's an internal error needing context @@ -166,7 +166,7 @@ func (r *RootCmd) AddPrometheusPortFlag() { func (r *RootCmd) getPrometheusPortFlag(cmd *cobra.Command) (int, error) { port, _ := cmd.Flags().GetInt(constant.FlagPrometheusPort) if port == 0 { - port = r.PortFromConfig(constant.FlagPrometheusPort) + port, _ = r.PortFromConfig(constant.FlagPrometheusPort) } return port, nil } @@ -189,8 +189,7 @@ func (r *RootCmd) AddCommand(cmds ...*cobra.Command) { r.Command.AddCommand(cmds...) } -func (r *RootCmd) -PortFromConfig(portType string) (int, error) { +func (r *RootCmd) PortFromConfig(portType string) (int, error) { // Retrieve the port and cache it port, err := r.cmdItf.GetPortFromConfig(portType) if err != nil {