Permalink
Browse files

doc: remove %D in doc and test*.conf

  • Loading branch information...
1 parent 9e0128b commit b5597e790cba38939a53a00c6f57b5290cccf484 @HardySimpson committed Nov 15, 2012
Showing with 25 additions and 73 deletions.
  1. +5 −3 TODO
  2. +8 −33 doc/UsersGuide-CN.lyx
  3. +7 −32 doc/UsersGuide-EN.lyx
  4. +2 −2 test/test_hello.conf
  5. +1 −1 test/test_press_zlog.conf
  6. +1 −1 test/test_press_zlog2.conf
  7. +1 −1 test/test_record.conf
View
8 TODO
@@ -1,4 +1,5 @@
[p] 使用valgrind测试性能
+[ ] conf解析行那一段不一定正确, 要支持行中带#注释
[ ] hzlog的可定制
[ ] hex那段重写,内置到buf内,参考od的设计
[ ] 分类匹配的可定制化, rcat
@@ -13,11 +14,12 @@
[ ] redis对接,协议设计
[ ] 和rsyslog对接的问题
[ ] linux fsync->fdatasync, open..
-[ ] conf解析行那一段不一定正确, 要支持行中带#注释
--- 1.2.5 ---
-[ ] 恢复thread_list方案,同时保证在单个线程退出的时候自动删除thread
-[ ] 缓存多个时间,保证所有的%d在strftime的时候都能每秒缓存
+[o] 保证在单个线程退出的时候自动删除thread, 用atexit来注册函数解决主线程退出的问题
+[o] 缓存多个时间,保证所有的%d在strftime的时候都能每秒缓存,达到和原先%D一样的速度
+[o] 鉴于上面那点,去掉%D的使用,虽然库还支持,但文档和实例代码都用%d
+[o] 修复makefile静态链接zlog-chk-conf
--- 1.2.4 ---
[o] 不再维持thread_list链表,每次写日志时判断配置有无更新,来刷新每线程的缓存大小
--- 1.2.0 ---
View
@@ -1123,7 +1123,7 @@ rotate lock file = /tmp/zlog.lock
\end_layout
\begin_layout LyX-Code
-default format = "%D.%us %-6P (%c:%F:%L) - %m%n"
+default format = "%d.%us %-6P (%c:%F:%L) - %m%n"
\end_layout
\begin_layout LyX-Code
@@ -1159,7 +1159,7 @@ simple = "%m%n"
\end_layout
\begin_layout LyX-Code
-normal = "%D %m%n"
+normal = "%d %m%n"
\end_layout
\begin_layout LyX-Code
@@ -1343,7 +1343,7 @@ default format
\end_layout
\begin_layout LyX-Code
-"%D %V [%p:%F:%L] %m%n"
+"%d %V [%p:%F:%L] %m%n"
\end_layout
\begin_layout Standard
@@ -1567,7 +1567,7 @@ zlog_info(c, "hello, zlog");
\begin_layout Standard
\begin_inset Tabular
-<lyxtabular version="3" rows="22" columns="3">
+<lyxtabular version="3" rows="21" columns="3">
<features islongtable="true" longtabularalignment="center">
<column alignment="center" valignment="top" width="10text%">
<column alignment="left" valignment="top" width="50text%">
@@ -1676,33 +1676,8 @@ reference "sub:时间字符"
%d 2012-02-14 17:03:12
\end_layout
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
\begin_layout Plain Layout
-%D
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-相当于%d(%F %T),zlog默认时间串,在性能上比%d有一定的提升
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-2012-02-14 17:03:12
+%d()
\end_layout
\end_inset
@@ -1713,7 +1688,7 @@ reference "sub:时间字符"
\begin_inset Text
\begin_layout Plain Layout
-%E()
+%%E()
\end_layout
\end_inset
@@ -6269,7 +6244,7 @@ zlog允许用户自定义输出函数。输出函数需要绑定到某条特殊
\end_layout
\begin_layout LyX-Code
-*.* $name, "record path %c %D"; simple
+*.* $name, "record path %c %d"; simple
\end_layout
\begin_layout Standard
@@ -7382,7 +7357,7 @@ simple = "%m%n"
\end_layout
\begin_layout LyX-Code
-my_cat.* $myoutput, " mypath %c %D";simple
+my_cat.* $myoutput, " mypath %c %d";simple
\end_layout
\end_deeper
View
@@ -1725,7 +1725,7 @@ The recognized conversion characters are
\begin_layout Standard
\begin_inset Tabular
-<lyxtabular version="3" rows="22" columns="3">
+<lyxtabular version="3" rows="21" columns="3">
<features islongtable="true" longtabularalignment="center">
<column alignment="center" valignment="top" width="10text%">
<column alignment="left" valignment="top" width="50text%">
@@ -1840,33 +1840,8 @@ for more detail.
%d 2012-02-14 17:03:12
\end_layout
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-%D
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Equivalent to %d(%F %T), but faster
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
\begin_layout Plain Layout
-2012-02-14 17:03:12
+%d() 2012-02-14 17:03:12
\end_layout
\end_inset
@@ -1877,7 +1852,7 @@ Equivalent to %d(%F %T), but faster
\begin_inset Text
\begin_layout Plain Layout
-%E()
+%%E()
\end_layout
\end_inset
@@ -5168,7 +5143,7 @@ It is optional.
\end_layout
\begin_layout LyX-Code
-default format = "%D %V [%p:%F:%L] %m%n"
+default format = "%d %V [%p:%F:%L] %m%n"
\end_layout
\end_deeper
@@ -6727,7 +6702,7 @@ zlog allows user defines his own output function.
\end_layout
\begin_layout LyX-Code
-*.* $name, "record path %c %D"; simple
+*.* $name, "record path %c %d"; simple
\end_layout
\begin_layout Standard
@@ -6993,7 +6968,7 @@ $ cat test_mdc.conf
\end_layout
\begin_layout LyX-Code
-mdc_format= "%D.%ms %-6V (%c:%F:%L) [%M(myname)] - %m%n"
+mdc_format= "%d.%ms %-6V (%c:%F:%L) [%M(myname)] - %m%n"
\end_layout
\begin_layout LyX-Code
@@ -7893,7 +7868,7 @@ simple = "%m%n"
\end_layout
\begin_layout LyX-Code
-my_cat.* $myoutput, " mypath %c %D";simple
+my_cat.* $myoutput, " mypath %c %d";simple
\end_layout
\end_deeper
View
@@ -1,6 +1,6 @@
[formats]
-simple = "%D.%ms %m%n"
-simple2 = "%D.%us %m%n"
+simple = "%d.%ms %m%n"
+simple2 = "%d.%us %m%n"
[rules]
my_cat.* >stderr;
my_cat.* >stdout;simple
@@ -1,7 +1,7 @@
[global]
#default format = "%d(%F %T).%us %-6V %p:%T:%F:%L %m%n"
-default format = "%D.%us %-6V %p:%T:%F:%L %m%n"
+default format = "%d.%us %-6V %p:%T:%F:%L %m%n"
[rules]
# time ./test_press_zlog 1 10 100000 real user sys
@@ -1,5 +1,5 @@
[global]
-default format = "%D.%us %-6V %p:%T:%F:%L %m%n"
+default format = "%d.%us %-6V %p:%T:%F:%L %m%n"
[rules]
cat0.* "press.0.log"
View
@@ -1,4 +1,4 @@
[formats]
simple = "%m%n"
[rules]
-my_cat.* $myoutput, " mypath %c %D";simple
+my_cat.* $myoutput, " mypath %c %d";simple

0 comments on commit b5597e7

Please sign in to comment.