1
0
ithewei 4 жил өмнө
parent
commit
a774a4fa49
4 өөрчлөгдсөн 21 нэмэгдсэн , 2 устгасан
  1. 3 0
      base/hlog.c
  2. 15 0
      base/hlog.h
  3. 1 1
      event/nlog.h
  4. 2 1
      examples/hloop_test.c

+ 3 - 0
base/hlog.c

@@ -389,6 +389,9 @@ int logger_print(logger_t* logger, int level, const char* fmt, ...) {
                     va_end(ap);
                 }
                     break;
+                case '%':
+                    buf[len++] = '%';
+                    break;
                 default: break;
                 }
             } else {

+ 15 - 0
base/hlog.h

@@ -86,6 +86,21 @@ HV_EXPORT void logger_set_handler(logger_t* logger, logger_handler fn);
 HV_EXPORT void logger_set_level(logger_t* logger, int level);
 // level = [VERBOSE,DEBUG,INFO,WARN,ERROR,FATAL,SILENT]
 HV_EXPORT void logger_set_level_by_str(logger_t* logger, const char* level);
+/*
+ * format  = "%y-%m-%d %H:%M:%S.%Z %L %s"
+ * message = "2020-01-02 03:04:05.067 DEBUG message"
+ * %y year
+ * %m month
+ * %d day
+ * %H hour
+ * %M min
+ * %S sec
+ * %Z ms
+ * %l First character of level
+ * %L All characters of level
+ * %s message
+ * %% %
+ */
 HV_EXPORT void logger_set_format(logger_t* logger, const char* format);
 HV_EXPORT void logger_set_max_bufsize(logger_t* logger, unsigned int bufsize);
 HV_EXPORT void logger_enable_color(logger_t* logger, int on);

+ 1 - 1
event/nlog.h

@@ -20,7 +20,7 @@ void timer_write_log(htimer_t* timer) {
 
 int main() {
     hloop_t* loop = hloop_new(0);
-    hlog_set_logger(network_logger);
+    hlog_set_handler(network_logger);
     nlog_listen(loop, DEFAULT_LOG_PORT);
     htimer_add(loop, timer_write_log, 1000, INFINITE);
     hloop_run(loop);

+ 2 - 1
examples/hloop_test.c

@@ -89,8 +89,9 @@ int main() {
 
     // test network_logger
     htimer_add(loop, timer_write_log, 1000, INFINITE);
-    logger_set_handler(hlog, mylogger);
+    hlog_set_handler(mylogger);
     hlog_set_file("loop.log");
+    hlog_set_format(DEFAULT_LOG_FORMAT);
 #ifndef _MSC_VER
     logger_enable_color(hlog, 1);
 #endif