Add option to always log to syslog.

Author: tarickb

src/client.cc

@@ -133,16 +133,24 @@ int RequestPrompts(sasl_client_params_t *params, sasl_interact_t **prompts,
   return SASL_INTERACT;
 }
 
+Log::Options GetLogOptions() {
+  if (Config::Get()->always_log_to_syslog()) return Log::OPTIONS_IMMEDIATE;
+  if (Config::Get()->log_full_trace_on_failure())
+    return Log::OPTIONS_FULL_TRACE_ON_FAILURE;
+  return Log::OPTIONS_NONE;
+}
+
+Log::Target GetLogTarget() {
+  if (Config::Get()->always_log_to_syslog() ||
+      Config::Get()->log_to_syslog_on_failure())
+    return Log::TARGET_SYSLOG;
+  return Log::TARGET_NONE;
+}
+
 }  // namespace
 
 Client::Client() {
-  const Log::Options log_options = Config::Get()->log_full_trace_on_failure()
-                                       ? Log::OPTIONS_FULL_TRACE_ON_FAILURE
-                                       : Log::OPTIONS_NONE;
-  const Log::Target log_target = Config::Get()->log_to_syslog_on_failure()
-                                     ? Log::TARGET_DEFAULT
-                                     : Log::TARGET_NONE;
-  log_ = Log::Create(log_options, log_target);
+  log_ = Log::Create(GetLogOptions(), GetLogTarget());
   log_->Write("Client: created");
 }
 

src/config.cc

@@ -145,6 +145,10 @@ int Config::Init(const Json::Value &root) {
     err = Fetch(root, "client_secret", false, &client_secret_);
     if (err != SASL_OK) return err;
 
+    err = Fetch(root, "always_log_to_syslog", true,
+                &always_log_to_syslog_);
+    if (err != SASL_OK) return err;
+
     err = Fetch(root, "log_to_syslog_on_failure", true,
                 &log_to_syslog_on_failure_);
     if (err != SASL_OK) return err;

src/config.h

@@ -34,6 +34,7 @@ class Config {
 
   std::string client_id() const { return client_id_; }
   std::string client_secret() const { return client_secret_; }
+  bool always_log_to_syslog() const { return always_log_to_syslog_; }
   bool log_to_syslog_on_failure() const { return log_to_syslog_on_failure_; }
   bool log_full_trace_on_failure() const { return log_full_trace_on_failure_; }
   std::string token_endpoint() const { return token_endpoint_; }
@@ -48,6 +49,7 @@ class Config {
 
   std::string client_id_;
   std::string client_secret_;
+  bool always_log_to_syslog_ = false;
   bool log_to_syslog_on_failure_ = true;
   bool log_full_trace_on_failure_ = false;
   std::string token_endpoint_ = "https://accounts.google.com/o/oauth2/token";