Skip to content
Snippets Groups Projects
Unverified Commit e13246fa authored by CTFang@WireLab's avatar CTFang@WireLab
Browse files

Fix: no stuck in NFRegist if failed

parent da274d1b
Branches
Tags
No related merge requests found
...@@ -31,9 +31,11 @@ func SendSearchNFInstances(targetNfType models.NfType) ([]models.NfProfile, erro ...@@ -31,9 +31,11 @@ func SendSearchNFInstances(targetNfType models.NfType) ([]models.NfProfile, erro
logger.ConsumerLog.Errorf("SearchNFInstances failed: %+v", err) logger.ConsumerLog.Errorf("SearchNFInstances failed: %+v", err)
} }
defer func() { defer func() {
if res != nil {
if resCloseErr := res.Body.Close(); resCloseErr != nil { if resCloseErr := res.Body.Close(); resCloseErr != nil {
logger.ConsumerLog.Errorf("NFInstancesStoreApi response body cannot close: %+v", resCloseErr) logger.ConsumerLog.Errorf("NFInstancesStoreApi response body cannot close: %+v", resCloseErr)
} }
}
}() }()
if res != nil && res.StatusCode == http.StatusTemporaryRedirect { if res != nil && res.StatusCode == http.StatusTemporaryRedirect {
......
...@@ -26,6 +26,7 @@ func SendNFRegistration() error { ...@@ -26,6 +26,7 @@ func SendNFRegistration() error {
var res *http.Response var res *http.Response
var err error var err error
retryTime := 0
for { for {
nf, res, err = GetSelf(). nf, res, err = GetSelf().
NFManagementClient. NFManagementClient.
...@@ -34,6 +35,10 @@ func SendNFRegistration() error { ...@@ -34,6 +35,10 @@ func SendNFRegistration() error {
if err != nil || res == nil { if err != nil || res == nil {
logger.ConsumerLog.Infof("Webconsole-AF register to NRF Error[%s]", err.Error()) logger.ConsumerLog.Infof("Webconsole-AF register to NRF Error[%s]", err.Error())
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
retryTime += 1
if retryTime == 10 {
return fmt.Errorf("NF Register retry failed %+v times.", retryTime)
}
continue continue
} }
defer func() { defer func() {
...@@ -80,7 +85,6 @@ func RetrySendNFRegistration(MaxRetry int) error { ...@@ -80,7 +85,6 @@ func RetrySendNFRegistration(MaxRetry int) error {
logger.ConsumerLog.Warnf("Send NFRegistration Failed by %v", err) logger.ConsumerLog.Warnf("Send NFRegistration Failed by %v", err)
retryCount++ retryCount++
} }
logger.ConsumerLog.Errorln("[AF] Retry NF Registration has meet maximum")
return fmt.Errorf("[AF] Retry NF Registration has meet maximum") return fmt.Errorf("[AF] Retry NF Registration has meet maximum")
} }
......
...@@ -101,14 +101,16 @@ func (a *WebuiApp) Start(tlsKeyLogPath string) { ...@@ -101,14 +101,16 @@ func (a *WebuiApp) Start(tlsKeyLogPath string) {
os.Exit(0) os.Exit(0)
}() }()
go func() {
err := webui_context.SendNFRegistration() err := webui_context.SendNFRegistration()
if err != nil { if err != nil {
retry_err := webui_context.RetrySendNFRegistration(10) retry_err := webui_context.RetrySendNFRegistration(1)
if retry_err != nil { if retry_err != nil {
logger.InitLog.Errorln(retry_err) logger.InitLog.Errorln(retry_err)
return logger.InitLog.Warningln("The registration to NRF failed, resulting in limited functionalities.")
} }
} }
}()
router := WebUI.NewRouter() router := WebUI.NewRouter()
WebUI.SetAdmin() WebUI.SetAdmin()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment