From 01623fb2a926218e5b08e24d7a2b6eeb46c67b60 Mon Sep 17 00:00:00 2001
From: "CTFang@WireLab" <ctfang.cs12@nycu.edu.tw>
Date: Tue, 23 Apr 2024 07:03:31 +0000
Subject: [PATCH] fix: fix linter error
---
backend/billing/client.go | 4 ++--
backend/billing/server.go | 3 +--
backend/factory/factory.go | 4 ++--
backend/webui_service/webui_init.go | 6 +++---
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/backend/billing/client.go b/backend/billing/client.go
index 09c829a..e042e21 100644
--- a/backend/billing/client.go
+++ b/backend/billing/client.go
@@ -1,7 +1,7 @@
package billing
import (
- "io/ioutil"
+ "io"
"strconv"
"time"
@@ -52,7 +52,7 @@ func PullCDRFile(c *ftp.ServerConn, fileName string) ([]byte, error) {
return nil, err
}
- cdr, err1 := ioutil.ReadAll(r)
+ cdr, err1 := io.ReadAll(r)
return cdr, err1
}
diff --git a/backend/billing/server.go b/backend/billing/server.go
index a7d9a82..f2ef046 100644
--- a/backend/billing/server.go
+++ b/backend/billing/server.go
@@ -3,7 +3,6 @@ package billing
import (
"encoding/json"
- "io/ioutil"
"os"
"strconv"
"sync"
@@ -79,7 +78,7 @@ func OpenServer(wg *sync.WaitGroup) *BillingDomain {
return nil
}
- if err := ioutil.WriteFile(confFile, file, 0o600); err != nil { //nolint: gomnd
+ if err := os.WriteFile(confFile, file, 0o600); err != nil { //nolint: gomnd
logger.BillingLog.Errorf("Couldn't create conf file %v", confFile)
return nil
}
diff --git a/backend/factory/factory.go b/backend/factory/factory.go
index 57726b3..fa4e23e 100644
--- a/backend/factory/factory.go
+++ b/backend/factory/factory.go
@@ -6,7 +6,7 @@ package factory
import (
"fmt"
- "io/ioutil"
+ "os"
"github.com/asaskevich/govalidator"
"gopkg.in/yaml.v2"
@@ -22,7 +22,7 @@ func InitConfigFactory(f string, cfg *Config) error {
// Use default config path
f = WebuiDefaultConfigPath
}
- if content, err := ioutil.ReadFile(f); err != nil {
+ if content, err := os.ReadFile(f); err != nil {
return fmt.Errorf("[Factory] %+v", err)
} else {
logger.CfgLog.Infof("Read config from [%s]", f)
diff --git a/backend/webui_service/webui_init.go b/backend/webui_service/webui_init.go
index f08d685..2b9c901 100644
--- a/backend/webui_service/webui_init.go
+++ b/backend/webui_service/webui_init.go
@@ -1,7 +1,7 @@
package webui_service
import (
- "io/ioutil"
+ "io"
"os"
"os/signal"
"runtime/debug"
@@ -39,14 +39,14 @@ func (a *WebuiApp) SetLogEnable(enable bool) {
logger.MainLog.Infof("Log enable is set to [%v]", enable)
if enable && logger.Log.Out == os.Stderr {
return
- } else if !enable && logger.Log.Out == ioutil.Discard {
+ } else if !enable && logger.Log.Out == io.Discard {
return
}
a.cfg.SetLogEnable(enable)
if enable {
logger.Log.SetOutput(os.Stderr)
} else {
- logger.Log.SetOutput(ioutil.Discard)
+ logger.Log.SetOutput(io.Discard)
}
}
--
GitLab