From 375b88c19166750cee3b6c1753a7a8c71fb5e382 Mon Sep 17 00:00:00 2001
From: fooinha <fooinha@gmail.com>
Date: Thu, 18 Dec 2014 15:47:43 +0000
Subject: [PATCH] Optional arguments for syslog_logger factory.

---
 include/spdlog/common.h              | 29 ++++++++++++++++++++++++++++
 include/spdlog/details/spdlog_impl.h |  3 +--
 include/spdlog/sinks/syslog_sink.h   | 17 ----------------
 include/spdlog/spdlog.h              |  3 ++-
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/include/spdlog/common.h b/include/spdlog/common.h
index 1be17d0d..1712ee56 100644
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@@ -27,13 +27,42 @@
 #include<initializer_list>
 #include<chrono>
 
+#ifdef __linux__
+
+#define SYSLOG_NAMES 1
+#include <syslog.h>
+#endif
+
 namespace spdlog
 {
+
 class formatter;
+
 namespace sinks
 {
+
 class sink;
+
+#ifdef __linux__
+namespace syslog
+{
+namespace option
+{
+typedef enum
+{
+    CONS     = LOG_CONS,
+    NDELAY   = LOG_NDELAY,
+    NOWAIT   = LOG_NOWAIT,
+    ODELAY   = LOG_ODELAY,
+    PERROR   = LOG_PERROR,
+    PID      = LOG_PID
+} option_enum;
 }
+}
+#endif
+
+}
+
 
 // Common types across the lib
 using log_clock = std::chrono::system_clock;
diff --git a/include/spdlog/details/spdlog_impl.h b/include/spdlog/details/spdlog_impl.h
index 0199a8df..c50cef89 100644
--- a/include/spdlog/details/spdlog_impl.h
+++ b/include/spdlog/details/spdlog_impl.h
@@ -87,11 +87,10 @@ inline std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st(const std::strin
 
 #ifdef __linux__
 // Create syslog logger
-inline std::shared_ptr<spdlog::logger> spdlog::syslog_logger(const std::string& logger_name, const std::string& ident, int option , const std::string & facility)
+inline std::shared_ptr<spdlog::logger> spdlog::syslog_logger(const std::string& logger_name, const std::string& ident, int option, const std::string &facility)
 {
     return create<spdlog::sinks::syslog_sink>(logger_name, ident, option, facility);
 }
-
 #endif
 
 
diff --git a/include/spdlog/sinks/syslog_sink.h b/include/spdlog/sinks/syslog_sink.h
index 6a597d2d..2270f184 100644
--- a/include/spdlog/sinks/syslog_sink.h
+++ b/include/spdlog/sinks/syslog_sink.h
@@ -28,9 +28,7 @@
 
 #include <string>
 
-#define SYSLOG_NAMES 1
 
-#include <syslog.h>
 #include "./sink.h"
 #include "../common.h"
 #include "../details/log_msg.h"
@@ -40,21 +38,6 @@ namespace spdlog
 {
 namespace sinks
 {
-namespace syslog
-{
-namespace option
-{
-typedef enum
-{
-    CONS     = LOG_CONS,
-    NDELAY   = LOG_NDELAY,
-    NOWAIT   = LOG_NOWAIT,
-    ODELAY   = LOG_ODELAY,
-    PERROR   = LOG_PERROR,
-    PID      = LOG_PID
-} option_enum;
-}
-}
 /**
  * Sink that write to syslog using the `syscall()` library call.
  *
diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h
index 7e285efd..bb9b4980 100644
--- a/include/spdlog/spdlog.h
+++ b/include/spdlog/spdlog.h
@@ -96,7 +96,8 @@ std::shared_ptr<logger> stderr_logger_st(const std::string& logger_name);
 // Create a syslog logger
 //
 #ifdef __linux__
-std::shared_ptr<logger> syslog_logger(const std::string& logger_name, const std::string& ident, int option, const std::string &facility);
+
+std::shared_ptr<logger> syslog_logger(const std::string& logger_name, const std::string& ident = "", int option = static_cast<int>(sinks::syslog::option::PID), const std::string &facility = "user");
 #endif
 
 //