1
0
mirror of https://github.com/taigrr/godns synced 2025-01-18 04:03:25 -08:00

fix golint warnings

This commit is contained in:
Timothy 2017-10-27 09:59:08 +08:00
parent 622b77d431
commit 723f4d3322

View File

@ -16,23 +16,23 @@ import (
) )
const ( const (
// L_INFO log level // Info log level
L_INFO int = iota Info int = iota
// L_WARNING log level // Warning log level
L_WARNING Warning
// L_DEBUG log level // Debug log level
L_DEBUG Debug
// PRE_INFO log level // PreInfo log level
PRE_INFO = "[ INFO]" PreInfo = "[ INFO]"
// PRE_WARNING log level // PreWarning log level
PRE_WARNING = "[WARNING]" PreWarning = "[WARNING]"
// PRE_DEBUG log level // PreDebug log level
PRE_DEBUG = "[ DEBUG]" PreDebug = "[ DEBUG]"
) )
// Logger struct // Logger struct
type Logger struct { type Logger struct {
DEV_MODE bool DevMode bool
fd *os.File fd *os.File
size int size int
num int num int
@ -47,11 +47,11 @@ type Logger struct {
// NewLogger returns a new created logger // NewLogger returns a new created logger
func NewLogger(logfile string, size, num int, level int, flushInterval int64, flushSize int) (logger *Logger, err error) { func NewLogger(logfile string, size, num int, level int, flushInterval int64, flushSize int) (logger *Logger, err error) {
if size < 1 || num < 1 || level < L_INFO || len(logfile) < 1 { if size < 1 || num < 1 || level < Info || len(logfile) < 1 {
err = errors.New("newLogWriter:param error") err = errors.New("newLogWriter:param error")
return return
} }
logger = &Logger{size: size * 1024, num: num, level: level, DEV_MODE: false} logger = &Logger{size: size * 1024, num: num, level: level, DevMode: false}
logger.fd, err = os.OpenFile(logfile, os.O_WRONLY|os.O_APPEND|os.O_CREATE, os.ModeAppend|0666) logger.fd, err = os.OpenFile(logfile, os.O_WRONLY|os.O_APPEND|os.O_CREATE, os.ModeAppend|0666)
if err != nil { if err != nil {
logger = nil logger = nil
@ -79,16 +79,16 @@ func NewLogger(logfile string, size, num int, level int, flushInterval int64, fl
// InitLogger initialize logger with specified log filename & size // InitLogger initialize logger with specified log filename & size
func InitLogger(logfile string, size, num int) (err error) { func InitLogger(logfile string, size, num int) (err error) {
logger, err := NewLogger(logfile, size, num, L_INFO, -1, -1) logger, err := NewLogger(logfile, size, num, Info, -1, -1)
if logger != nil { if logger != nil {
logger.level = L_INFO - 1 logger.level = Info - 1
} }
return return
} }
// immplement write // immplement write
func (logger *Logger) Write(p []byte) (n int, err error) { func (logger *Logger) Write(p []byte) (n int, err error) {
if logger.DEV_MODE { if logger.DevMode {
n, err = os.Stdout.Write(p) n, err = os.Stdout.Write(p)
return return
} }
@ -208,12 +208,12 @@ func (logger *Logger) setPrefix(lv int) bool {
} }
switch lv { switch lv {
case L_INFO: case Info:
logger.log.SetPrefix(PRE_INFO) logger.log.SetPrefix(PreInfo)
case L_WARNING: case Warning:
logger.log.SetPrefix(PRE_WARNING) logger.log.SetPrefix(PreWarning)
case L_DEBUG: case Debug:
logger.log.SetPrefix(PRE_DEBUG) logger.log.SetPrefix(PreDebug)
default: default:
return false return false
} }
@ -263,48 +263,48 @@ func (logger *Logger) Close() {
// Info output info log // Info output info log
func (logger *Logger) Info(args ...interface{}) { func (logger *Logger) Info(args ...interface{}) {
logger.logPrint(L_INFO, args...) logger.logPrint(Info, args...)
} }
// Infoln output info log with newline // Infoln output info log with newline
func (logger *Logger) Infoln(args ...interface{}) { func (logger *Logger) Infoln(args ...interface{}) {
logger.logPrintln(L_INFO, args...) logger.logPrintln(Info, args...)
} }
// Infof output formatted info log // Infof output formatted info log
func (logger *Logger) Infof(format string, args ...interface{}) { func (logger *Logger) Infof(format string, args ...interface{}) {
logger.logPrintf(L_INFO, format, args...) logger.logPrintf(Info, format, args...)
} }
// Warning output warning log // Warning output warning log
func (logger *Logger) Warning(args ...interface{}) { func (logger *Logger) Warning(args ...interface{}) {
logger.logPrint(L_WARNING, args...) logger.logPrint(Warning, args...)
} }
//Warningln output warning log with newline //Warningln output warning log with newline
func (logger *Logger) Warningln(args ...interface{}) { func (logger *Logger) Warningln(args ...interface{}) {
logger.logPrintln(L_WARNING, args...) logger.logPrintln(Warning, args...)
} }
// Warningf output formatted warning log // Warningf output formatted warning log
func (logger *Logger) Warningf(format string, args ...interface{}) { func (logger *Logger) Warningf(format string, args ...interface{}) {
logger.logPrintf(L_WARNING, format, args...) logger.logPrintf(Warning, format, args...)
} }
// Debug output debug log // Debug output debug log
func (logger *Logger) Debug(args ...interface{}) { func (logger *Logger) Debug(args ...interface{}) {
logger.logPrint(L_DEBUG, args...) logger.logPrint(Debug, args...)
logger.Flush() logger.Flush()
} }
// Debugln output debug log with newline // Debugln output debug log with newline
func (logger *Logger) Debugln(args ...interface{}) { func (logger *Logger) Debugln(args ...interface{}) {
logger.logPrintln(L_DEBUG, args...) logger.logPrintln(Debug, args...)
logger.Flush() logger.Flush()
} }
// Debugf output formatted debug log // Debugf output formatted debug log
func (logger *Logger) Debugf(format string, args ...interface{}) { func (logger *Logger) Debugf(format string, args ...interface{}) {
logger.logPrintf(L_DEBUG, format, args...) logger.logPrintf(Debug, format, args...)
logger.Flush() logger.Flush()
} }