深夜Art版

#### Version 1.2.1 * 启动日志增加dotweb ASCII art logo * 调整默认日志的时间毫秒段为4位 * 2017-10-05 22:00
tender2017 · Oct 5, 2017 · 7b03d7b · 7b03d7b
1 parent d7de21a
commit 7b03d7b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 3 deletions.
diff --git a/dotweb.go b/dotweb.go
@@ -67,6 +67,10 @@ func New() *DotWeb {
 
 	//init logger
 	logger.InitLog()
+
+	logDotLogo()
+
+	logger.Logger().Debug("Dotweb Start New AppServer", LogTarget_HttpServer)
 	return app
 }
 
@@ -454,3 +458,11 @@ func showQuery(ctx Context) error {
 	}
 	return nil
 }
+
+func logDotLogo() {
+	logger.Logger().DebugRaw(`    ____           __                     __`, LogTarget_HttpServer)
+	logger.Logger().DebugRaw(`   / __ \  ____   / /_ _      __  ___    / /_`, LogTarget_HttpServer)
+	logger.Logger().DebugRaw(`  / / / / / __ \ / __/| | /| / / / _ \  / __ \`, LogTarget_HttpServer)
+	logger.Logger().DebugRaw(` / /_/ / / /_/ // /_  | |/ |/ / /  __/ / /_/ /`, LogTarget_HttpServer)
+	logger.Logger().DebugRaw(`/_____/  \____/ \__/  |__/|__/  \___/ /_.___/`, LogTarget_HttpServer)
+}
diff --git a/example/main.go b/example/main.go
@@ -29,7 +29,7 @@ func main() {
 	app.SetEnabledLog(true)
 
 	//开启development模式
-	app.SetProductionMode()
+	app.SetDevelopmentMode()
 
 	//设置gzip开关
 	//app.HttpServer.SetEnabledGzip(true)

diff --git a/logger/logger.go b/logger/logger.go
@@ -20,6 +20,7 @@ type AppLog interface {
 	SetEnabledConsole(enabled bool)
 	SetEnabledLog(enabledLog bool)
 	Debug(log string, logTarget string)
+	DebugRaw(log string, logTarget string)
 	Info(log string, logTarget string)
 	Warn(log string, logTarget string)
 	Error(log string, logTarget string)

diff --git a/logger/xlog.go b/logger/xlog.go
@@ -14,6 +14,7 @@ type chanLog struct {
 	Content   string
 	LogTarget string
 	LogLevel  string
+	isRaw     bool
 	logCtx    *logContext
 }
 
@@ -34,14 +35,18 @@ func NewXLog() *xLog {
 const (
 	defaultDateFormatForFileName = "2006_01_02"
 	defaultDateLayout            = "2006-01-02"
-	defaultFullTimeLayout        = "2006-01-02 15:04:05.999999"
+	defaultFullTimeLayout        = "2006-01-02 15:04:05.9999"
 	defaultTimeLayout            = "2006-01-02 15:04:05"
 )
 
 func (l *xLog) Debug(log string, logTarget string) {
 	l.Log(log, logTarget, LogLevel_Debug)
 }
 
+func (l *xLog) DebugRaw(log string, logTarget string) {
+	l.log(log, logTarget, LogLevel_Debug, true)
+}
+
 func (l *xLog) Info(log string, logTarget string) {
 	l.Log(log, logTarget, LogLevel_Info)
 }
@@ -55,6 +60,10 @@ func (l *xLog) Error(log string, logTarget string) {
 }
 
 func (l *xLog) Log(log string, logTarget string, logLevel string) {
+	l.log(log, logTarget, logLevel, false)
+}
+
+func (l *xLog) log(log string, logTarget string, logLevel string, isRaw bool) {
 	if l.enabledLog {
 		skip := 3
 		logCtx, err := callerInfo(skip)
@@ -66,6 +75,7 @@ func (l *xLog) Log(log string, logTarget string, logLevel string) {
 			LogTarget: logTarget + "_" + logLevel,
 			Content:   log,
 			LogLevel:  logLevel,
+			isRaw:     isRaw,
 			logCtx:    logCtx,
 		}
 		l.logChan_Custom <- chanLog
@@ -106,7 +116,10 @@ func (l *xLog) writeLog(chanLog chanLog, level string) {
 		filePath = filePath + "_" + time.Now().Format(defaultDateFormatForFileName) + ".log"
 		break
 	}
-	log := fmt.Sprintf(fmt.Sprintf("[%s] %s [%s:%v] %s", chanLog.LogLevel, time.Now().Format(defaultFullTimeLayout), chanLog.logCtx.fileName, chanLog.logCtx.line, chanLog.Content))
+	log := chanLog.Content
+	if !chanLog.isRaw {
+		log = fmt.Sprintf(fmt.Sprintf("[%s] %s [%s:%v] %s", chanLog.LogLevel, time.Now().Format(defaultFullTimeLayout), chanLog.logCtx.fileName, chanLog.logCtx.line, chanLog.Content))
+	}
 	if l.enabledConsole {
 		fmt.Println(log)
 	}

diff --git a/version.MD b/version.MD
@@ -1,5 +1,10 @@
 ## dotweb版本记录：
 
+#### Version 1.2.1
+* 启动日志增加dotweb ASCII art logo
+* 调整默认日志的时间毫秒段为4位
+* 2017-10-05 22:00
+
 #### Version 1.2
 * 国庆特别版 - 2017年的国庆，恰逢中秋双节，祝愿国家繁荣昌盛，祝愿代码艺术家们双节快乐！
 * 主要新增HttpModule模块、新增ServerConfig：EnabledIgnoreFavicon、完善HttpContext、完善debug日志输出