Rebase master

Signed-off-by: YanzheL <lee.yanzhe@yanzhe.org>
dragonflyoss · Jan 14, 2020 · 1a20200 · 1a20200
1 parent bf81246
commit 1a20200
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/docs/config/dfdaemon_config_template.yml b/docs/config/dfdaemon_config_template.yml
@@ -74,3 +74,8 @@ verbose: false
 
 # The maximum number of CPUs that the dfdaemon can use
 maxprocs: 10
+
+# Logging
+logConfig:
+  # Log file path
+  path: /dev/stdout
diff --git a/docs/config/dfdaemon_properties.md b/docs/config/dfdaemon_properties.md
@@ -10,6 +10,7 @@ The following startup parameters are supported for `dfdaemon`
 | ------------- | ------------- |
 | dfget_flags |	dfget properties |
 | dfpath | dfget bin path |
+| logConfig | Logging properties |
 | hijack_https | HijackHTTPS is the list of hosts whose https requests should be hijacked by dfdaemon. The first matched rule will be used |
 | localrepo | Temp output dir of dfdaemon, by default `$HOME/.small-dragonfly/dfdaemon/data/` |
 | proxies | Proxies is the list of rules for the transparent proxy |