File tree Expand file tree Collapse file tree 3 files changed +13
-3
lines changed Expand file tree Collapse file tree 3 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -92,9 +92,15 @@ func NewLogger() Logger {
92
92
fmt .Println (err )
93
93
level = 7
94
94
}
95
+ if level > 7 {
96
+ level = 7
97
+ }
98
+ if level < 0 {
99
+ level = 0
100
+ }
95
101
return & logger {
96
102
output : os .Stderr ,
97
- level : uint (level ),
103
+ level : uint (level ), // #nosec G115 - level is constrained to 0-7
98
104
}
99
105
}
100
106
Original file line number Diff line number Diff line change @@ -2,11 +2,11 @@ package logging
2
2
3
3
import (
4
4
"bufio"
5
+ "fmt"
5
6
"io"
6
7
"io/ioutil"
7
8
"log"
8
9
"os"
9
- "strconv"
10
10
"strings"
11
11
"testing"
12
12
)
@@ -32,7 +32,8 @@ var settingList []LogSetting = []LogSetting{
32
32
}
33
33
34
34
func testLoggerLevel (t * testing.T , targetLevel uint ) {
35
- tempFile := newFile ("testing level " + strconv .Itoa (int (targetLevel )), t )
35
+ testName := fmt .Sprintf ("testing level %v" , targetLevel )
36
+ tempFile := newFile (testName , t )
36
37
testLogger := & logger {
37
38
output : tempFile ,
38
39
level : targetLevel ,
Original file line number Diff line number Diff line change @@ -25,6 +25,9 @@ func main() {
25
25
flag .Parse ()
26
26
27
27
if _ , ok := os .LookupEnv ("LOG_LEVEL" ); ! ok {
28
+ if * logLevel > 7 {
29
+ * logLevel = 7
30
+ }
28
31
os .Setenv ("LOG_LEVEL" , strconv .Itoa (int (* logLevel )))
29
32
}
30
33
You can’t perform that action at this time.
0 commit comments