Configure dfclient/dfdaemon/dfget log file path via 'logConfig.path' property #1145
Conversation
|
We found this is your first time to contribute to Dragonfly, @YanzheL |
YanzheL
force-pushed
the
configurable-logfile-path
branch
2 times, most recently
from
b214098 to
bc6f296
Compare
YanzheL
force-pushed
the
configurable-logfile-path
branch
from
bc6f296 to
618ba1d
Compare
Codecov Report
@@ Coverage Diff @@
## master #1145 +/- ##
==========================================
- Coverage 47.65% 47.63% -0.02%
==========================================
Files 115 115
Lines 7225 7228 +3
==========================================
Hits 3443 3443
- Misses 3508 3511 +3
Partials 274 274
Continue to review full report at Codecov.
|
pkg/dflog/log.go
Outdated
| @@ -72,7 +77,7 @@ func getLumberjack(l *logrus.Logger) *lumberjack.Logger { | |||
| func WithLogFile(f string, maxSize, maxBackups int) Option { | |||
| return func(l *logrus.Logger) error { | |||
| if f == "" { | |||
| return nil | |||
| f = filepath.Join("logs", "dfdaemon.log") | |||
There was a problem hiding this comment.
In fact, not only dfdaemon will use this function, so do with dfget and supenrode.
There was a problem hiding this comment.
Ok, I rollbacked the change of this line, and set the default log path for dfget/dfdaemon in caller (See my new commits).
As for supernode, I didn't touch its code. Because it writes to two different log files, a single logConfig.path property is not enough to configure the location of these files.
For now, this PR configures the log path of dfget/dfdaemon, not for supernode.
|
@YanzheL thanks for your contributing very much! Could you please rebase the code and fix the conflict and reviewed comment, then I will merge this pr. |
Signed-off-by: YanzheL <[email protected]>
Signed-off-by: YanzheL <[email protected]>
Signed-off-by: YanzheL <[email protected]>
YanzheL
force-pushed
the
configurable-logfile-path
branch
from
693b47b to
54b4918
Compare
Signed-off-by: YanzheL <[email protected]>
Signed-off-by: YanzheL <[email protected]>
YanzheL
changed the title
I updated and rebased the PR, thanks. |
Signed-off-by: YanzheL [email protected]
Ⅰ. Describe what this PR did
Currently, there is no option for user to customize the log file path, which causes inconvenience while using
dfclientin container.For a typical use case, it is expected that the dfclient container logs to stdout so we can inspect the logs via
docker logs -f <dfclient>instead of checking the log file in default location~/.small-dragonfly/logs/dfdaemon.logThis PR enables user to configure the log file path via configuration property
logConfig.path.For example
Ⅱ. Does this pull request fix one issue?
NONE
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
Already tested in container.
Ⅳ. Describe how to verify it
Build the dockerfile
Add this property in dfclient configuration file
You will see the log in
stdoutinstead of the default location~/.small-dragonfly/logs/dfdaemon.logⅤ. Special notes for reviews