Merge "wireguard: Add routes for allowedIPs" into tizen

[platform/upstream/connman.git] / src / log.c

diff --git a/src/log.c b/src/log.c
index 444e75f..7a4839b 100755 (executable)
--- a/src/log.c
+++ b/src/log.c
@@ -40,6 +40,11 @@ static const char *program_path;
 #if defined TIZEN_EXT
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <stdbool.h>
+#include <dlog.h>
+
+#undef LOG_TAG
+#define LOG_TAG "CONNMAN"
 
 #define LOG_FILE_PATH "/opt/usr/data/network/connman.log"
 #define MAX_LOG_SIZE   1 * 1024 * 1024
@@ -51,6 +56,29 @@ static const char *program_path;
 #define syslog __connman_log_s
 
 static FILE *log_file = NULL;
+static bool dlog_logging = true;
+static bool file_logging = true;
+static bool simple_log = true;
+
+bool get_simple_log_option(void)
+{
+       return simple_log;
+}
+
+void set_simple_log_option(bool option)
+{
+       simple_log = option;
+}
+
+void set_dlog_logging_option(bool option)
+{
+       dlog_logging = option;
+}
+
+void set_file_logging_option(bool option)
+{
+       file_logging = option;
+}
 
 void __connman_log_open(const char *ident, int option, int facility)
 {
@@ -127,7 +155,7 @@ void __connman_log(const int log_priority, const char *format, va_list ap)
        int log_size = 0;
        struct stat buf;
        char str[256];
-       char strtime[40];
+       char strtime[64];
 
        if (!log_file)
                log_file = (FILE *)fopen(LOG_FILE_PATH, "a+");
@@ -168,7 +196,11 @@ void __connman_log_s(int log_priority, const char *format, ...)
 
        va_start(ap, format);
 
-       vsyslog(LOG_DEBUG, format, ap);
+       if (dlog_logging)
+               dlog_vprint(DLOG_DEBUG, LOG_TAG, format, ap);
+
+       if (file_logging)
+               vsyslog(LOG_DEBUG, format, ap);
 
        va_end(ap);
 }
@@ -189,7 +221,12 @@ void connman_info(const char *format, ...)
        va_list ap;
 
        va_start(ap, format);
+#if defined TIZEN_EXT
+       if (dlog_logging)
+               dlog_vprint(DLOG_INFO, LOG_TAG, format, ap);
 
+       if (file_logging)
+#endif
        vsyslog(LOG_INFO, format, ap);
 
        va_end(ap);
@@ -207,7 +244,12 @@ void connman_warn(const char *format, ...)
        va_list ap;
 
        va_start(ap, format);
+#if defined TIZEN_EXT
+       if (dlog_logging)
+               dlog_vprint(DLOG_WARN, LOG_TAG, format, ap);
 
+       if (file_logging)
+#endif
        vsyslog(LOG_WARNING, format, ap);
 
        va_end(ap);
@@ -225,7 +267,12 @@ void connman_error(const char *format, ...)
        va_list ap;
 
        va_start(ap, format);
+#if defined TIZEN_EXT
+       if (dlog_logging)
+               dlog_vprint(DLOG_ERROR, LOG_TAG, format, ap);
 
+       if (file_logging)
+#endif
        vsyslog(LOG_ERR, format, ap);
 
        va_end(ap);
@@ -243,7 +290,12 @@ void connman_debug(const char *format, ...)
        va_list ap;
 
        va_start(ap, format);
+#if defined TIZEN_EXT
+       if (dlog_logging)
+               dlog_vprint(DLOG_DEBUG, LOG_TAG, format, ap);
 
+       if (file_logging)
+#endif
        vsyslog(LOG_DEBUG, format, ap);
 
        va_end(ap);