gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move to Go 1.19, remote io/util, fix data race and a flapper

Browse Source 
Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
This commit is contained in:
Ivan Kozlovic
2022-08-05 09:55:37 -06:00
parent be54b08afd
commit 3c9a7cc6e5
50 changed files with 294 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
logger/log_test.go
View File

@@ -17,7 +17,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"log"
"os"
"path/filepath"
@@ -115,7 +114,7 @@ func TestFileLogger(t *testing.T) {
defer logger.Close()
logger.Noticef("foo")
buf, err := ioutil.ReadFile(file.Name())
buf, err := os.ReadFile(file.Name())
if err != nil {
t.Fatalf("Could not read logfile: %v", err)
}
@@ -134,7 +133,7 @@ func TestFileLogger(t *testing.T) {
defer logger.Close()
logger.Errorf("foo")
buf, err = ioutil.ReadFile(file.Name())
buf, err = os.ReadFile(file.Name())
if err != nil {
t.Fatalf("Could not read logfile: %v", err)
}
@@ -191,7 +190,7 @@ func TestFileLoggerSizeLimit(t *testing.T) {
logger.Noticef("This is a line in the log file")
}
files, err := ioutil.ReadDir(tmpDir)
files, err := os.ReadDir(tmpDir)
if err != nil {
t.Fatalf("Error reading logs dir: %v", err)
}
@@ -202,7 +201,7 @@ func TestFileLoggerSizeLimit(t *testing.T) {
if err := logger.Close(); err != nil {
t.Fatalf("Error closing log: %v", err)
}
content, err := ioutil.ReadFile(file.Name())
content, err := os.ReadFile(file.Name())
if err != nil {
t.Fatalf("Error loading latest log: %v", err)
}
@@ -224,7 +223,7 @@ func TestFileLoggerSizeLimit(t *testing.T) {
for i := 0; i < 50; i++ {
logger.Noticef("This is line %d in the log file", i+1)
}
files, err = ioutil.ReadDir(tmpDir)
files, err = os.ReadDir(tmpDir)
if err != nil {
t.Fatalf("Error reading logs dir: %v", err)
}
@@ -235,7 +234,7 @@ func TestFileLoggerSizeLimit(t *testing.T) {
// Now set a limit that is below current size
logger.SetSizeLimit(1000)
// Should have triggered rotation
files, err = ioutil.ReadDir(tmpDir)
files, err = os.ReadDir(tmpDir)
if err != nil {
t.Fatalf("Error reading logs dir: %v", err)
}
@@ -246,7 +245,7 @@ func TestFileLoggerSizeLimit(t *testing.T) {
t.Fatalf("Error closing log: %v", err)
}
lastBackup = files[len(files)-1]
content, err = ioutil.ReadFile(file.Name())
content, err = os.ReadFile(file.Name())
if err != nil {
t.Fatalf("Error loading latest log: %v", err)
}
@@ -277,12 +276,12 @@ func TestFileLoggerSizeLimit(t *testing.T) {
// Close
logger.Close()
files, err = ioutil.ReadDir(tmpDir)
files, err = os.ReadDir(tmpDir)
if err != nil {
t.Fatalf("Error reading logs dir: %v", err)
}
lastBackup = files[len(files)-1]
content, err = ioutil.ReadFile(filepath.Join(tmpDir, lastBackup.Name()))
content, err = os.ReadFile(filepath.Join(tmpDir, lastBackup.Name()))
if err != nil {
t.Fatalf("Error reading backup file: %v", err)
}
@@ -331,7 +330,7 @@ func createDir(t *testing.T, prefix string) string {
if err := os.MkdirAll(tempRoot, 0700); err != nil {
t.Fatal(err)
}
dir, err := ioutil.TempDir(tempRoot, prefix)
dir, err := os.MkdirTemp(tempRoot, prefix)
if err != nil {
t.Fatal(err)
}
@@ -340,7 +339,7 @@ func createDir(t *testing.T, prefix string) string {
func createFileAtDir(t *testing.T, dir, prefix string) *os.File {
t.Helper()
f, err := ioutil.TempFile(dir, prefix)
f, err := os.CreateTemp(dir, prefix)
if err != nil {
t.Fatal(err)
}