diff options
author | Utkarsh Sanghi <usanghi@google.com> | 2015-11-09 09:13:57 -0800 |
---|---|---|
committer | Utkarsh Sanghi <usanghi@google.com> | 2015-11-09 09:17:10 -0800 |
commit | ae4cee7f6558e5ed9130be812618c1886d16a4cb (patch) | |
tree | 6f110b596256ff93b16491035e71887aab0e04c6 | |
parent | 04c073b0ce233820bc6fae23cd007d23270b3683 (diff) | |
download | tpm_manager-ae4cee7f6558e5ed9130be812618c1886d16a4cb.tar.gz |
This CL defaults tpm_manager daemon logging to syslog.
Logs can be forwarded to stderr by passing the --log_to_stderr switch.
tpm_manager_client now logs to stderr by default.
Bug: 25567627
TEST=Compile and run on DUT
Change-Id: Icd72aa309207eb5dac884bf1ce57209d69288d1d
-rw-r--r-- | client/main.cc | 2 | ||||
-rw-r--r-- | server/main.cc | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/client/main.cc b/client/main.cc index 4a1c164..79ae520 100644 --- a/client/main.cc +++ b/client/main.cc @@ -327,7 +327,7 @@ class ClientLoop : public ClientLoopBase { int main(int argc, char* argv[]) { base::CommandLine::Init(argc, argv); - brillo::InitLog(brillo::kLogToSyslog | brillo::kLogToStderr); + brillo::InitLog(brillo::kLogToStderr); tpm_manager::ClientLoop loop; return loop.Run(); } diff --git a/server/main.cc b/server/main.cc index 8a4e74c..dfbe024 100644 --- a/server/main.cc +++ b/server/main.cc @@ -104,7 +104,12 @@ class TpmManagerDaemon : public brillo::DBusServiceDaemon { int main(int argc, char* argv[]) { base::CommandLine::Init(argc, argv); - brillo::InitLog(brillo::kLogToSyslog | brillo::kLogToStderr); + base::CommandLine *cl = base::CommandLine::ForCurrentProcess(); + int flags = brillo::kLogToSyslog; + if (cl->HasSwitch("log_to_stderr")) { + flags |= brillo::kLogToStderr; + } + brillo::InitLog(flags); TpmManagerDaemon daemon; LOG(INFO) << "TpmManager Daemon Started."; return daemon.Run(); |