Log format #704
Merged
Log format #704
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
October 17, 2024 18:32
killing
reviewed
Oct 22, 2024
common/log.c
Outdated
| @@ -59,12 +62,24 @@ seafile_log (const gchar *log_domain, GLogLevelFlags log_level, | |||
| if (log_level > seafile_log_level) | |||
| return; | |||
|
|
|||
| if (log_to_stdout) { | |||
| fputs ("[seaf-server] ", logfp); | |||
There was a problem hiding this comment.
应该在 seafile_log_init 函数增加一个参数（第一个参数），用于指定组件的名称，因为需要区分 seaf-server, seaf-fuse, controller 三个组件的日志的。还有 slow log 也有自己的日志名称。
controller/seafile-controller.c
Outdated
| @@ -202,6 +202,7 @@ start_seaf_server () | |||
| "-l", logfile, | |||
| "-P", ctl->pidfile[PID_SERVER], | |||
| "-p", ctl->rpc_pipe_path, | |||
| "-f", | |||
There was a problem hiding this comment.
controller 和 seaf-server 应该在检测到 SEAFILE_LOG_TO_STDOUT 这个环境变量之后，主动禁用 daemon mode。这里不应该直接禁用 daemon mode，因为会影响非 docker 部署的用户。docker 部署下，应该是不需要 daemon mode 的，因为容器会一直运行。
controller/seafile-controller.c
Outdated
| if (seafile_log_init (logfile, ccnet_debug_level_str, | ||
| seafile_debug_level_str) < 0) { | ||
| seafile_log_init ("-", ccnet_debug_level_str, seafile_debug_level_str); | ||
| seaf_error ("Failed to init log.\n"); |
There was a problem hiding this comment.
在 seafile_log_init 之前的日志，就用 printf 输出就行了，这些都是些参数错误，在生产环境是不会出现的，所以不重要。其他几个组件也不需要改这些日志的输出了。
server/gc/seafserv-gc.c
Outdated
| "-r, --rm-deleted: remove garbaged repos\n" | ||
| "-R, --rm-fs: remove fs object\n" | ||
| "-D, --dry-run: report blocks that can be remove, but not remove them\n" | ||
| "-V, --verbose: verbose output messages\n"); |
killing
reviewed
Oct 23, 2024
controller/seafile-controller.c
Outdated
| "-l", logfile, | ||
| "-P", ctl->pidfile[PID_SERVER], | ||
| "-p", ctl->rpc_pipe_path, | ||
| "-f", |
There was a problem hiding this comment.
我之前的意思是，seaf-server, controller 这些会一直运行的程序，应该在检测到 SEAFILE_LOG_TO_STDOUT 之后，主动禁用掉 daemon mode，不理会输入的 -f 参数。不是在 controller 启动他们的时候通过 -f 参数控制。
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.