diff --git a/g/os/gcmd/gcmd.go b/g/os/gcmd/gcmd.go index a5601806f..db7f8e2c6 100644 --- a/g/os/gcmd/gcmd.go +++ b/g/os/gcmd/gcmd.go @@ -15,60 +15,60 @@ import ( ) // Console values. -type gCmdValue struct { - values []string +type gCmdValue struct { + values []string } // Console options. type gCmdOption struct { - options map[string]string + options map[string]string } -var Value = &gCmdValue{} // Console values. -var Option = &gCmdOption{} // Console options. +var Value = &gCmdValue{} // Console values. +var Option = &gCmdOption{} // Console options. var cmdFuncMap = make(map[string]func()) // Registered callback functions. func init() { - reg := regexp.MustCompile(`\-\-{0,1}(.+?)=(.+)`) - Option.options = make(map[string]string) - for i := 0; i < len(os.Args); i++ { - result := reg.FindStringSubmatch(os.Args[i]) - if len(result) > 1 { - Option.options[result[1]] = result[2] - } else { - Value.values = append(Value.values, os.Args[i]) - } - } + reg := regexp.MustCompile(`\-\-{0,1}(.+?)=(.+)`) + Option.options = make(map[string]string) + for i := 0; i < len(os.Args); i++ { + result := reg.FindStringSubmatch(os.Args[i]) + if len(result) > 1 { + Option.options[result[1]] = result[2] + } else { + Value.values = append(Value.values, os.Args[i]) + } + } } // BindHandle registers callback function with . -func BindHandle (cmd string, f func()) { - if _, ok := cmdFuncMap[cmd]; ok { - glog.Fatal("duplicated handle for command:" + cmd) - } else { - cmdFuncMap[cmd] = f - } +func BindHandle(cmd string, f func()) { + if _, ok := cmdFuncMap[cmd]; ok { + glog.Fatal("duplicated handle for command:" + cmd) + } else { + cmdFuncMap[cmd] = f + } } // RunHandle executes the callback function registered by . -func RunHandle (cmd string) { - if handle, ok := cmdFuncMap[cmd]; ok { - handle() - } else { - glog.Fatal("no handle found for command:" + cmd) - } +func RunHandle(cmd string) { + if handle, ok := cmdFuncMap[cmd]; ok { + handle() + } else { + glog.Fatal("no handle found for command:" + cmd) + } } // AutoRun automatically recognizes and executes the callback function // by value of index 0 (the first console parameter). -func AutoRun () { - if cmd := Value.Get(1); cmd != "" { - if handle, ok := cmdFuncMap[cmd]; ok { - handle() - } else { - glog.Fatal("no handle found for command:" + cmd) - } - } else { - glog.Fatal("no command found") - } +func AutoRun() { + if cmd := Value.Get(1); cmd != "" { + if handle, ok := cmdFuncMap[cmd]; ok { + handle() + } else { + glog.Fatal("no handle found for command:" + cmd) + } + } else { + glog.Fatal("no command found") + } } diff --git a/g/os/gcron/gcron_entry.go b/g/os/gcron/gcron_entry.go index 35762c91d..b4802eba0 100644 --- a/g/os/gcron/gcron_entry.go +++ b/g/os/gcron/gcron_entry.go @@ -15,18 +15,22 @@ import ( "time" ) -// 定时任务项 +// Timed task entry. type Entry struct { - cron *Cron // 所属定时任务 - entry *gtimer.Entry // 定时器任务对象 - schedule *cronSchedule // 定时任务配置对象 - jobName string // 任务注册方法名称 - Name string // 定时任务名称 - Job func() // 注册定时任务方法 - Time time.Time // 注册时间 + cron *Cron // Cron object belonged to. + entry *gtimer.Entry // Associated gtimer.Entry. + schedule *cronSchedule // Timed schedule object. + jobName string // Callback function name(address info). + Name string // Entry name. + Job func() `json:"-"` // Callback function. + Time time.Time // Registered time. } -// 创建定时任务 +// addEntry creates and returns a new Entry object. +// Param is the callback function for timed task execution. +// Param specifies whether timed task executing in singleton mode. +// Param limits the times for timed task executing. +// Param names this entry for manual control. func (c *Cron) addEntry(pattern string, job func(), singleton bool, times int, name ... string) (*Entry, error) { schedule, err := newSchedule(pattern) if err != nil { diff --git a/g/os/glog/glog.go b/g/os/glog/glog.go index 65f92ba80..bdd08f641 100644 --- a/g/os/glog/glog.go +++ b/g/os/glog/glog.go @@ -3,11 +3,10 @@ // This Source Code Form is subject to the terms of the MIT License. // If a copy of the MIT was not distributed with this file, // You can obtain one at https://github.com/gogf/gf. +// // @author john, zseeker // Package glog implements powerful and easy-to-use levelled logging functionality. -// -// 日志模块, 直接文件/输出操作，没有异步逻辑，没有使用缓存或者通道 package glog import ( @@ -29,10 +28,10 @@ const ( ) var ( - // default level for log + // Default level for log defaultLevel = gtype.NewInt(LEVEL_ALL) - // default logger object, for package method usage + // Default logger object, for package method usage logger = New() ) @@ -41,8 +40,6 @@ func init() { } // SetPath sets the directory path for file logging. -// -// 日志日志目录绝对路径. func SetPath(path string) { logger.SetPath(path) } @@ -50,151 +47,113 @@ func SetPath(path string) { // SetFile sets the file name for file logging. // Datetime pattern can be used in , eg: access-{Ymd}.log. // The default file name pattern is: Y-m-d.log, eg: 2018-01-01.log -// -// 日志文件名称. func SetFile(pattern string) { logger.SetFile(pattern) } // SetLevel sets the default logging level. -// -// 设置全局的日志记录等级. func SetLevel(level int) { logger.SetLevel(level) defaultLevel.Set(level) } -// SetWriter sets the customed logging for logging. +// SetWriter sets the customized logging for logging. // The object should implements the io.Writer interface. -// Developer can use customed logging to redirect logging output to another service, +// Developer can use customized logging to redirect logging output to another service, // eg: kafka, mysql, mongodb, etc. -// -// 可自定义IO接口，IO可以是文件输出、标准输出、网络输出. func SetWriter(writer io.Writer) { logger.SetWriter(writer) } -// GetWriter returns the customed writer object, which implements the io.Writer interface. -// It returns nil if no customed writer set. -// -// 返回自定义的IO，默认为nil. +// GetWriter returns the customized writer object, which implements the io.Writer interface. +// It returns nil if no customized writer set. func GetWriter() io.Writer { return logger.GetWriter() } // GetLevel returns the default logging level value. -// -// 获取全局的日志记录等级. func GetLevel() int { return defaultLevel.Val() } // SetDebug enables/disables the debug level for default logger. // The debug level is enbaled in default. -// -// 设置是否允许输出DEBUG信息. func SetDebug(debug bool) { logger.SetDebug(debug) } -// SetStdPrint sets whether ouptput the logging contents to stdout, which is false indefault. -// -// 设置写日志的同时开启or关闭控制台打印，默认是关闭的 +// SetStdPrint sets whether ouptput the logging contents to stdout, which is false in default. func SetStdPrint(open bool) { logger.SetStdPrint(open) } // GetPath returns the logging directory path for file logging. // It returns empty string if no directory path set. -// -// 获取日志目录绝对路径 func GetPath() string { return logger.GetPath() } // PrintBacktrace prints the caller backtrace, -// the optional parameter specify the skipped backtraces offset from the end point. -// -// 打印文件调用回溯信息 +// the optional parameter specify the skipped backtrace offset from the end point. func PrintBacktrace(skip...int) { logger.PrintBacktrace(skip...) } // GetBacktrace returns the caller backtrace content, -// the optional parameter specify the skipped backtraces offset from the end point. -// -// 获取文件调用回溯信息. +// the optional parameter specify the skipped backtrace offset from the end point. func GetBacktrace(skip...int) string { return logger.GetBacktrace(skip...) } // SetBacktrace enables/disables the backtrace feature in failure logging outputs. -// -// 是否关闭全局的backtrace信息 func SetBacktrace(enabled bool) { logger.SetBacktrace(enabled) } // To is a chaining function, // which redirects current logging content output to the sepecified . -// -// 链式操作，设置下一次写入日志内容的Writer func To(writer io.Writer) *Logger { return logger.To(writer) } // Path is a chaining function, // which sets the directory path to for current logging content output. -// -// 链式操作，设置下一次输出的日志路径。 func Path(path string) *Logger { return logger.Path(path) } // Cat is a chaining function, // which sets the category to for current logging content output. -// -// 设置下一次输出的分类，支持多级分类设置. func Cat(category string) *Logger { return logger.Cat(category) } // File is a chaining function, // which sets file name for the current logging content output. -// -// 设置日志输出文件名称格式 func File(pattern string) *Logger { return logger.File(pattern) } // Level is a chaining function, // which sets logging level for the current logging content output. -// -// 设置日志打印等级. func Level(level int) *Logger { return logger.Level(level) } // Backtrace is a chaining function, // which sets backtrace options for the current logging content output . -// -// 设置文件调用回溯信息. func Backtrace(enabled bool, skip...int) *Logger { return logger.Backtrace(enabled, skip...) } // StdPrint is a chaining function, // which enables/disables stdout for the current logging content output. -// -// 是否允许在设置输出文件时同时也输出到终端 func StdPrint(enabled bool) *Logger { return logger.StdPrint(enabled) } // Header is a chaining function, // which enables/disables log header for the current logging content output. -// -// 是否打印每行日志头信息(默认开启) func Header(enabled bool) *Logger { return logger.Header(enabled) } diff --git a/g/os/glog/glog_logger.go b/g/os/glog/glog_logger.go index 84ebbbf68..8691beba3 100644 --- a/g/os/glog/glog_logger.go +++ b/g/os/glog/glog_logger.go @@ -3,6 +3,7 @@ // This Source Code Form is subject to the terms of the MIT License. // If a copy of the MIT was not distributed with this file, // You can obtain one at https://github.com/gogf/gf. +// // @author john, zseeker package glog @@ -26,15 +27,15 @@ import ( type Logger struct { mu sync.RWMutex - pr *Logger // 父级Logger - io io.Writer // 日志内容写入的IO接口 - path *gtype.String // 日志写入的目录路径 - file *gtype.String // 日志文件名称格式 - level *gtype.Int // 日志输出等级 - btSkip *gtype.Int // 错误产生时的backtrace回调信息skip条数 - btStatus *gtype.Int // 是否当打印错误时同时开启backtrace打印(默认-1，表示默认打印逻辑 - 错误才打印) - printHeader *gtype.Bool // 是否不打印前缀信息(时间，级别等) - alsoStdPrint *gtype.Bool // 控制台打印开关，当输出到文件/自定义输出时也同时打印到终端 + pr *Logger // Parent logger. + writer io.Writer // Customized io.Writer. + path *gtype.String // Logging directory path. + file *gtype.String // Format for logging file. + level *gtype.Int // Output level. + btSkip *gtype.Int // Skip count for backtrace. + btStatus *gtype.Int // Backtrace status(1: enabled - default; 0: disabled) + printHeader *gtype.Bool // Print header or not(true in default). + alsoStdPrint *gtype.Bool // Output to stdout or not(true in default). } const ( @@ -45,70 +46,66 @@ const ( ) var ( - // 默认的日志换行符 + // Default line break. ln = "\n" - // 标准输出互斥锁，防止标准输出串日志 + // Mutex to ensure log output sequence. stdMu = sync.RWMutex{} ) -// 初始化日志换行符 func init() { + // Initialize log line breaks depending on underlying os. if runtime.GOOS == "windows" { ln = "\r\n" } } -// New creates a custom logger. -// -// 新建自定义的日志操作对象 +// New creates and returns a custom logger. func New() *Logger { - return &Logger { - io : nil, + logger := &Logger { path : gtype.NewString(), file : gtype.NewString(gDEFAULT_FILE_FORMAT), level : gtype.NewInt(defaultLevel.Val()), btSkip : gtype.NewInt(), - btStatus : gtype.NewInt(-1), + btStatus : gtype.NewInt(1), printHeader : gtype.NewBool(true), alsoStdPrint : gtype.NewBool(true), } + logger.writer = &Writer { + logger : logger, + } + return logger } // Clone returns a new logger, which is the clone the current logger. -// -// Logger拷贝. func (l *Logger) Clone() *Logger { - return &Logger { + logger := &Logger { pr : l, - io : l.GetWriter(), path : l.path.Clone(), file : l.file.Clone(), level : l.level.Clone(), btSkip : l.btSkip.Clone(), - btStatus : l.btStatus.Clone(), + btStatus : l.btStatus.Clone(), printHeader : l.printHeader.Clone(), alsoStdPrint : l.alsoStdPrint.Clone(), } + logger.writer = &Writer { + logger : logger, + } + return logger } // SetLevel sets the logging level. -// -// 设置日志记录等级 func (l *Logger) SetLevel(level int) { l.level.Set(level) } // GetLevel returns the logging level value. -// -// 获取日志记录等级 func (l *Logger) GetLevel() int { return l.level.Val() } // SetDebug enables/disables the debug level for logger. -// The debug level is enbaled in default. -// -// 快捷方法，打开或关闭DEBU日志信息 +// The debug level is enabled in default. func (l *Logger) SetDebug(debug bool) { if debug { l.level.Set(l.level.Val() | LEVEL_DEBU) @@ -124,7 +121,6 @@ func (l *Logger) SetBacktrace(enabled bool) { } else { l.btStatus.Set(0) } - } // SetBacktraceSkip sets the backtrace offset from the end point. @@ -132,47 +128,41 @@ func (l *Logger) SetBacktraceSkip(skip int) { l.btSkip.Set(skip) } -// SetWriter sets the customed logging for logging. +// SetWriter sets the customized logging for logging. // The object should implements the io.Writer interface. -// Developer can use customed logging to redirect logging output to another service, +// Developer can use customized logging to redirect logging output to another service, // eg: kafka, mysql, mongodb, etc. -// -// 可自定义IO接口，IO可以是文件输出、标准输出、网络输出 func (l *Logger) SetWriter(writer io.Writer) { l.mu.Lock() - l.io = writer + l.writer = writer l.mu.Unlock() } -// GetWriter returns the customed writer object, which implements the io.Writer interface. -// It returns nil if no customed writer set. -// -// 返回自定义的IO，默认为nil +// GetWriter returns the customized writer object, which implements the io.Writer interface. +// It returns a default writer if no customized writer set. func (l *Logger) GetWriter() io.Writer { l.mu.RLock() - r := l.io + r := l.writer l.mu.RUnlock() return r } // getFilePointer returns the file pinter for file logging. -// It returns nil if file logging disabled, or file open fails. -// -// 获取默认的文件IO. +// It returns nil if file logging is disabled, or file opening fails. func (l *Logger) getFilePointer() *gfpool.File { if path := l.path.Val(); path != "" { - // 文件名称中使用"{}"包含的内容使用gtime格式化 + // Content containing "{}" in the file name is formatted using gtime file, _ := gregex.ReplaceStringFunc(`{.+?}`, l.file.Val(), func(s string) string { return gtime.Now().Format(strings.Trim(s, "{}")) }) - // 如果日志目录不存在则创建目录路径 + // Create path if it does not exist。 if !gfile.Exists(path) { if err := gfile.Mkdir(path); err != nil { fmt.Fprintln(os.Stderr, fmt.Sprintf(`[glog] mkdir "%s" failed: %s`, path, err.Error())) return nil } } - fpath := path + gfile.Separator + file + fpath := path + gfile.Separator + file if fp, err := gfpool.Open(fpath, gDEFAULT_FILE_POOL_FLAGS, gDEFAULT_FPOOL_PERM, gDEFAULT_FPOOL_EXPIRE); err == nil { return fp } else { @@ -183,14 +173,10 @@ func (l *Logger) getFilePointer() *gfpool.File { } // SetPath sets the directory path for file logging. -// -// 设置日志文件的存储目录路径. func (l *Logger) SetPath(path string) error { - // path必须有值 if path == "" { return errors.New("path is empty") } - // 如果目录不存在，则递归创建 if !gfile.Exists(path) { if err := gfile.Mkdir(path); err != nil { fmt.Fprintln(os.Stderr, fmt.Sprintf(`[glog] mkdir "%s" failed: %s`, path, err.Error())) @@ -203,8 +189,6 @@ func (l *Logger) SetPath(path string) error { // GetPath returns the logging directory path for file logging. // It returns empty string if no directory path set. -// -// 获取设置的日志目录路径 func (l *Logger) GetPath() string { return l.path.Val() } @@ -212,29 +196,24 @@ func (l *Logger) GetPath() string { // SetFile sets the file name for file logging. // Datetime pattern can be used in , eg: access-{Ymd}.log. // The default file name pattern is: Y-m-d.log, eg: 2018-01-01.log -// -// 设置日志文件名称格式. func (l *Logger) SetFile(pattern string) { l.file.Set(pattern) } -// SetStdPrint sets whether ouptput the logging contents to stdout, which is false indefault. -// -// 设置写日志时开启or关闭控制台打印，默认是关闭的 +// SetStdPrint sets whether output the logging contents to stdout, which is false in default. func (l *Logger) SetStdPrint(enabled bool) { l.alsoStdPrint.Set(enabled) } -// 这里的写锁保证统一时刻只会写入一行日志，防止串日志的情况 +// print prints to defined writer, logging file or passed . +// It internally uses memory lock for file logging to ensure logging sequence. func (l *Logger) print(std io.Writer, s string) { - // 优先使用自定义的IO输出 + // Customized writer has the most high priority. if l.printHeader.Val() { s = l.format(s) } writer := l.GetWriter() - if writer == nil { - // 如果设置的writer为空，那么其次判断是否有文件输出设置 - // 内部使用了内存锁，保证在glog中对同一个日志文件的并发写入不会串日志(并发安全) + if _, ok := writer.(*Writer); ok { if f := l.getFilePointer(); f != nil { defer f.Close() key := l.path.Val() @@ -245,7 +224,7 @@ func (l *Logger) print(std io.Writer, s string) { fmt.Fprintln(os.Stderr, err.Error()) } } - // 当没有设置writer时，需要判断是否允许输出到标准输出 + // Also output to stdout? if l.alsoStdPrint.Val() { l.doStdLockPrint(std, s) } @@ -254,7 +233,7 @@ func (l *Logger) print(std io.Writer, s string) { } } -// 并发安全打印到标准输出 +// doStdLockPrint prints to concurrent-safely. func (l *Logger) doStdLockPrint(std io.Writer, s string) { stdMu.Lock() if _, err := std.Write([]byte(s)); err != nil { @@ -263,23 +242,21 @@ func (l *Logger) doStdLockPrint(std io.Writer, s string) { stdMu.Unlock() } -// 核心打印数据方法(标准输出) +// stdPrint prints content without backtrace. func (l *Logger) stdPrint(s string) { l.print(os.Stdout, s) } -// 核心打印数据方法(标准错误) +// stdPrint prints content with backtrace check. func (l *Logger) errPrint(s string) { - // 记录调用回溯信息 - status := l.btStatus.Val() - if status == -1 || status == 1 { + if l.btStatus.Val() == 1 { s = l.appendBacktrace(s) } - // 防止串日志情况，这里不使用stderr，而是使用stdout + // In matter of sequence, do not use stderr here, but use the same stdout. l.print(os.Stdout, s) } -// 输出内容中添加回溯信息 +// appendBacktrace appends backtrace to the . func (l *Logger) appendBacktrace(s string, skip...int) string { trace := l.GetBacktrace(skip...) if trace != "" { @@ -298,17 +275,13 @@ func (l *Logger) appendBacktrace(s string, skip...int) string { } // PrintBacktrace prints the caller backtrace, -// the optional parameter specify the skipped backtraces offset from the end point. -// -// 直接打印回溯信息，参数skip表示调用端往上多少级开始回溯 +// the optional parameter specify the skipped backtrace offset from the end point. func (l *Logger) PrintBacktrace(skip...int) { l.Println(l.appendBacktrace("", skip...)) } // GetBacktrace returns the caller backtrace content, -// the optional parameter specify the skipped backtraces offset from the end point. -// -// 获取文件调用回溯字符串，参数skip表示调用端往上多少级开始回溯 +// the optional parameter specify the skipped backtrace offset from the end point. func (l *Logger) GetBacktrace(skip...int) string { customSkip := 0 if len(skip) > 0 { @@ -507,8 +480,6 @@ func (l *Logger) Criticalfln(format string, v ...interface{}) { } // checkLevel checks whether the given could be output. -// -// 判断给定level是否满足 func (l *Logger) checkLevel(level int) bool { return l.level.Val() & level > 0 } \ No newline at end of file diff --git a/g/os/glog/glog_logger_chaining.go b/g/os/glog/glog_logger_chaining.go index 7b6ddf3eb..b478a6c76 100644 --- a/g/os/glog/glog_logger_chaining.go +++ b/g/os/glog/glog_logger_chaining.go @@ -13,8 +13,6 @@ import ( // To is a chaining function, // which redirects current logging content output to the specified . -// -// 链式操作，设置下一次写入日志内容的Writer func (l *Logger) To(writer io.Writer) *Logger { logger := (*Logger)(nil) if l.pr == nil { @@ -28,8 +26,6 @@ func (l *Logger) To(writer io.Writer) *Logger { // Path is a chaining function, // which sets the directory path to for current logging content output. -// -// 链式操作，设置下一次输出的日志路径。 func (l *Logger) Path(path string) *Logger { logger := (*Logger)(nil) if l.pr == nil { @@ -45,9 +41,7 @@ func (l *Logger) Path(path string) *Logger { // Cat is a chaining function, // which sets the category to for current logging content output. -// -// 链式操作，设置下一次输出的日志分类(可以按照文件目录层级设置)，在当前logpath或者当前工作目录下创建category目录， -// 这是一个链式操作，可以设置多个分类，将会创建层级的日志分类目录。 +// Param can be hierarchical, eg: module/user. func (l *Logger) Cat(category string) *Logger { logger := (*Logger)(nil) if l.pr == nil { @@ -64,8 +58,6 @@ func (l *Logger) Cat(category string) *Logger { // File is a chaining function, // which sets file name for the current logging content output. -// -// 日志文件格式 func (l *Logger) File(file string) *Logger { logger := (*Logger)(nil) if l.pr == nil { @@ -79,8 +71,6 @@ func (l *Logger) File(file string) *Logger { // Level is a chaining function, // which sets logging level for the current logging content output. -// -// 设置日志打印等级 func (l *Logger) Level(level int) *Logger { logger := (*Logger)(nil) if l.pr == nil { @@ -94,8 +84,6 @@ func (l *Logger) Level(level int) *Logger { // Backtrace is a chaining function, // which sets backtrace options for the current logging content output . -// -// 设置文件调用回溯信息 func (l *Logger) Backtrace(enabled bool, skip...int) *Logger { logger := (*Logger)(nil) if l.pr == nil { @@ -112,8 +100,6 @@ func (l *Logger) Backtrace(enabled bool, skip...int) *Logger { // StdPrint is a chaining function, // which enables/disables stdout for the current logging content output. -// -// 是否允许在设置输出文件时同时也输出到终端 func (l *Logger) StdPrint(enabled bool) *Logger { logger := (*Logger)(nil) if l.pr == nil { @@ -127,8 +113,6 @@ func (l *Logger) StdPrint(enabled bool) *Logger { // Header is a chaining function, // which enables/disables log header for the current logging content output. -// -// 是否打印每行日志头信息(默认开启) func (l *Logger) Header(enabled bool) *Logger { logger := (*Logger)(nil) if l.pr == nil { diff --git a/g/os/glog/glog_logger_writer.go b/g/os/glog/glog_logger_writer.go new file mode 100644 index 000000000..525fe438f --- /dev/null +++ b/g/os/glog/glog_logger_writer.go @@ -0,0 +1,18 @@ +// Copyright 2017 gf Author(https://github.com/gogf/gf). All Rights Reserved. +// +// This Source Code Form is subject to the terms of the MIT License. +// If a copy of the MIT was not distributed with this file, +// You can obtain one at https://github.com/gogf/gf. + +package glog + +type Writer struct { + logger *Logger +} + +// Write implements the io.Writer interface. +// It just prints the content with header or level. +func (w *Writer) Write(p []byte) (n int, err error) { + w.logger.Header(false).Print(string(p)) + return len(p), nil +} \ No newline at end of file diff --git a/g/util/gutil/gutil.go b/g/util/gutil/gutil.go index 70b60e1e4..f64730ed9 100644 --- a/g/util/gutil/gutil.go +++ b/g/util/gutil/gutil.go @@ -39,7 +39,7 @@ func Export(i...interface{}) string { // 这里强制对所有map进行反射处理转换 refValue := reflect.ValueOf(v) if refValue.Kind() == reflect.Map { - m := make(map[string]interface{}) + m := make(map[string]interface{}) keys := refValue.MapKeys() for _, k := range keys { m[gconv.String(k.Interface())] = refValue.MapIndex(k).Interface() diff --git a/geg/os/gcron/gcron2.go b/geg/os/gcron/gcron2.go index f078b4810..7390efd68 100644 --- a/geg/os/gcron/gcron2.go +++ b/geg/os/gcron/gcron2.go @@ -1,7 +1,7 @@ package main import ( - "fmt" + "github.com/gogf/gf/g" "github.com/gogf/gf/g/os/gcron" "time" ) @@ -12,7 +12,9 @@ func test() { func main() { _, err := gcron.Add("*/10 * * * * ?", test) - fmt.Println(err) - fmt.Println(gcron.Entries()) + if err != nil { + panic(err) + } + g.Dump(gcron.Entries()) time.Sleep(10 * time.Second) } diff --git a/geg/os/glog/glog_writer.go b/geg/os/glog/glog_writer.go new file mode 100644 index 000000000..792678261 --- /dev/null +++ b/geg/os/glog/glog_writer.go @@ -0,0 +1,12 @@ +package main + +import ( + "github.com/gogf/gf/g/os/glog" +) + +func main() { + w := glog.GetWriter() + w.Write([]byte("hello")) + + glog.Path("/tmp/glog/test").GetWriter().Write([]byte("hello")) +}