merge with master

diff --git a/include/dlog.h b/include/dlog.h
index 65c3f60..b1c566f 100755 (executable)
--- a/include/dlog.h
+++ b/include/dlog.h
@@ -98,7 +98,7 @@ typedef enum {
 #define LOGV(...)   (0)
 #else
 #define LOGV(format, arg...) \
-       (LOG_ON() ? (LOG(LOG_VERBOSE, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (LOG(LOG_VERBOSE, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 #endif
 /**
@@ -110,7 +110,7 @@ typedef enum {
 #else
 #define LOGV_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (LOG(LOG_VERBOSE, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (LOG(LOG_VERBOSE, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 #endif
 /**
@@ -118,7 +118,7 @@ typedef enum {
  */
 #ifndef LOGD
 #define LOGD(format, arg...) \
-       (LOG_ON() ? (LOG(LOG_DEBUG, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (LOG(LOG_DEBUG, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified macro to send a conditional verbose log message using the current LOG_TAG.
@@ -126,7 +126,7 @@ typedef enum {
 #ifndef LOGD_IF
 #define LOGD_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (LOG(LOG_DEBUG, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (LOG(LOG_DEBUG, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 
 /**
@@ -134,7 +134,7 @@ typedef enum {
  */
 #ifndef LOGI
 #define LOGI(format, arg...) \
-       (LOG_ON() ? (LOG(LOG_INFO, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (LOG(LOG_INFO, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified macro to send a conditional verbose log message using the current LOG_TAG.
@@ -142,7 +142,7 @@ typedef enum {
 #ifndef LOGI_IF
 #define LOGI_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (LOG(LOG_INFO, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (LOG(LOG_INFO, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 
 /**
@@ -150,7 +150,7 @@ typedef enum {
  */
 #ifndef LOGW
 #define LOGW(format, arg...) \
-       (LOG_ON() ? (LOG(LOG_WARN, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (LOG(LOG_WARN, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified macro to send a conditional verbose log message using the current LOG_TAG.
@@ -158,7 +158,7 @@ typedef enum {
 #ifndef LOGW_IF
 #define LOGW_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (LOG(LOG_WARN, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (LOG(LOG_WARN, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 
 /**
@@ -166,7 +166,7 @@ typedef enum {
  */
 #ifndef LOGE
 #define LOGE(format, arg...) \
-       (LOG_ON() ? (LOG(LOG_ERROR, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (LOG(LOG_ERROR, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified macro to send a conditional verbose log message using the current LOG_TAG.
@@ -174,14 +174,14 @@ typedef enum {
 #ifndef LOGE_IF
 #define LOGE_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (LOG(LOG_ERROR, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (LOG(LOG_ERROR, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified macro to send an error log message using the current LOG_TAG.
  */
 #ifndef LOGF
 #define LOGF(format, arg...) \
-       (LOG_ON() ? (LOG(LOG_FATAL, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (LOG(LOG_FATAL, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified macro to send a conditional verbose log message using the current LOG_TAG.
@@ -189,7 +189,7 @@ typedef enum {
 #ifndef LOGF_IF
 #define LOGF_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (LOG(LOG_FATAL, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (LOG(LOG_FATAL, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 
 // ---------------------------------------------------------------------
@@ -201,7 +201,7 @@ typedef enum {
 #define RLOGV(...)   (0)
 #else
 #define RLOGV(format, arg...) \
-       (LOG_ON() ? (RLOG(LOG_VERBOSE, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (RLOG(LOG_VERBOSE, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 #endif
 /**
@@ -213,7 +213,7 @@ typedef enum {
 #else
 #define RLOGV_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (RLOG(LOG_VERBOSE, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (RLOG(LOG_VERBOSE, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 #endif
 
@@ -222,7 +222,7 @@ typedef enum {
  */
 #ifndef RLOGD
 #define RLOGD(format, arg...) \
-       (LOG_ON() ? (RLOG(LOG_DEBUG, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (RLOG(LOG_DEBUG, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified radio macro to send a conditional verbose log message using the current LOG_TAG.
@@ -230,7 +230,7 @@ typedef enum {
 #ifndef RLOGD_IF
 #define RLOGD_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (RLOG(LOG_DEBUG, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (RLOG(LOG_DEBUG, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 
 /**
@@ -238,7 +238,7 @@ typedef enum {
  */
 #ifndef RLOGI
 #define RLOGI(format, arg...) \
-       (LOG_ON() ? (RLOG(LOG_INFO, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (RLOG(LOG_INFO, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified radio macro to send a conditional verbose log message using the current LOG_TAG.
@@ -246,7 +246,7 @@ typedef enum {
 #ifndef RLOGI_IF
 #define RLOGI_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (RLOG(LOG_INFO, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (RLOG(LOG_INFO, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 
 /**
@@ -254,7 +254,7 @@ typedef enum {
  */
 #ifndef RLOGW
 #define RLOGW(format, arg...) \
-       (LOG_ON() ? (RLOG(LOG_WARN, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (RLOG(LOG_WARN, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified radio macro to send a conditional verbose log message using the current LOG_TAG.
@@ -262,7 +262,7 @@ typedef enum {
 #ifndef RLOGW_IF
 #define RLOGW_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (RLOG(LOG_WARN, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (RLOG(LOG_WARN, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 
 /**
@@ -270,7 +270,7 @@ typedef enum {
  */
 #ifndef RLOGE
 #define RLOGE(format, arg...) \
-       (LOG_ON() ? (RLOG(LOG_ERROR, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (RLOG(LOG_ERROR, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified radio macro to send a conditional verbose log message using the current LOG_TAG.
@@ -278,14 +278,14 @@ typedef enum {
 #ifndef RLOGE_IF
 #define RLOGE_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (RLOG(LOG_ERROR, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (RLOG(LOG_ERROR, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified radio macro to send an error log message using the current LOG_TAG.
  */
 #ifndef RLOGF
 #define RLOGF(format, arg...) \
-       (LOG_ON() ? (RLOG(LOG_FATAL, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (RLOG(LOG_FATAL, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified radio macro to send a conditional verbose log message using the current LOG_TAG.
@@ -293,7 +293,7 @@ typedef enum {
 #ifndef RLOGF_IF
 #define RLOGF_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (RLOG(LOG_FATAL, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (RLOG(LOG_FATAL, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 
 
@@ -306,7 +306,7 @@ typedef enum {
 #define SLOGV(...)   (0)
 #else
 #define SLOGV(format, arg...) \
-       (LOG_ON() ? (SLOG(LOG_VERBOSE, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (SLOG(LOG_VERBOSE, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 #endif
 /**
@@ -318,7 +318,7 @@ typedef enum {
 #else
 #define SLOGV_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (SLOG(LOG_VERBOSE, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (SLOG(LOG_VERBOSE, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 #endif
 
@@ -327,7 +327,7 @@ typedef enum {
  */
 #ifndef SLOGD
 #define SLOGD(format, arg...) \
-       (LOG_ON() ? (SLOG(LOG_DEBUG, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (SLOG(LOG_DEBUG, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified system macro to send a conditional verbose log message using the current LOG_TAG.
@@ -335,7 +335,7 @@ typedef enum {
 #ifndef SLOGD_IF
 #define SLOGD_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (SLOG(LOG_DEBUG, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (SLOG(LOG_DEBUG, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 
 /**
@@ -343,7 +343,7 @@ typedef enum {
  */
 #ifndef SLOGI
 #define SLOGI(format, arg...) \
-       (LOG_ON() ? (SLOG(LOG_INFO, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (SLOG(LOG_INFO, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified system macro to send a conditional verbose log message using the current LOG_TAG.
@@ -351,7 +351,7 @@ typedef enum {
 #ifndef SLOGI_IF
 #define SLOGI_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (SLOG(LOG_INFO, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (SLOG(LOG_INFO, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 
 /**
@@ -359,7 +359,7 @@ typedef enum {
  */
 #ifndef SLOGW
 #define SLOGW(format, arg...) \
-       (LOG_ON() ? (SLOG(LOG_WARN, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (SLOG(LOG_WARN, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified system macro to send a conditional verbose log message using the current LOG_TAG.
@@ -367,7 +367,7 @@ typedef enum {
 #ifndef SLOGW_IF
 #define SLOGW_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (SLOG(LOG_WARN, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (SLOG(LOG_WARN, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 
 /**
@@ -375,7 +375,7 @@ typedef enum {
  */
 #ifndef SLOGE
 #define SLOGE(format, arg...) \
-       (LOG_ON() ? (SLOG(LOG_ERROR, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (SLOG(LOG_ERROR, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified system macro to send a conditional verbose log message using the current LOG_TAG.
@@ -383,14 +383,14 @@ typedef enum {
 #ifndef SLOGE_IF
 #define SLOGE_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (SLOG(LOG_ERROR, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (SLOG(LOG_ERROR, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified system macro to send an error log message using the current LOG_TAG.
  */
 #ifndef SLOGF
 #define SLOGF(format, arg...) \
-       (LOG_ON() ? (SLOG(LOG_FATAL, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+       (LOG_ON() ? (SLOG(LOG_FATAL, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 /**
  * Simplified system macro to send a conditional verbose log message using the current LOG_TAG.
@@ -398,7 +398,7 @@ typedef enum {
 #ifndef SLOGF_IF
 #define SLOGF_IF(cond, format, arg...) \
        (((CONDITION(cond)) && (LOG_ON())) ? \
-         (SLOG(LOG_FATAL, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+         (SLOG(LOG_FATAL, LOG_TAG, "%s: %s(%d) > " format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
 #endif
 
 // ---------------------------------------------------------------------

diff --git a/include/logger.h b/include/logger.h
index cca7567..5d6183f 100755 (executable)
--- a/include/logger.h
+++ b/include/logger.h
@@ -34,7 +34,7 @@ struct logger_entry {
 #define LOGGER_LOG_MAIN                "log_main"
 #define LOGGER_LOG_RADIO       "log_radio"
 #define LOGGER_LOG_SYSTEM      "log_system"
-#define LOGGER_LOG_APPS                "log_apps"
+#define LOGGER_LOG_APPS        "log_apps"
 
 #define LOGGER_ENTRY_MAX_LEN           (4*1024)
 #define LOGGER_ENTRY_MAX_PAYLOAD       (LOGGER_ENTRY_MAX_LEN - sizeof(struct logger_entry))

diff --git a/log.c b/log.c
index 02738b8..ba68b5f 100755 (executable)
--- a/log.c
+++ b/log.c
@@ -38,6 +38,7 @@
 static int log_fds[(int)LOG_ID_MAX] = { -1, -1, -1, -1 };
 
 static int g_logging_on = 1;
+static int g_dlog_level_init = 0;
 static int g_dlog_level = DLOG_SILENT;
 
 static int __dlog_init(log_id_t, log_priority, const char *tag, const char *msg);
@@ -53,13 +54,6 @@ static int __write_to_log_kernel(log_id_t log_id, log_priority prio, const char
        int log_fd;
        struct iovec vec[3];
 
-       if (log_id < LOG_ID_APPS) {
-               if(prio < g_dlog_level) {
-                       return 0;
-               }
-       } else if (LOG_ID_MAX <= log_id) {
-               return 0;
-       }
        if (log_id < LOG_ID_MAX)
                log_fd = log_fds[log_id];
        else
@@ -134,20 +128,6 @@ static int dlog_pri_to_journal_pri(log_priority prio)
 }
 static int __write_to_log_sd_journal_print(log_id_t log_id, log_priority prio, const char *tag, const char *msg)
 {
-       ssize_t ret;
-       int log_fd;
-
-       if (log_id < LOG_ID_APPS) {
-               if(prio < g_dlog_level) {
-                       return 0;
-               }
-       } else if (LOG_ID_MAX <= log_id) {
-               return 0;
-       }
-       if (log_id < LOG_ID_MAX)
-               log_fd = log_fds[log_id];
-       else
-               return -1;
        return sd_journal_print(dlog_pri_to_journal_pri(prio), "%c %s: %s",dlog_pri_to_char(prio), tag, msg);
 }
 #endif
@@ -171,6 +151,7 @@ void init_dlog_level(void)
                }
        } else
                g_dlog_level = 8;
+       g_dlog_level_init = 1;
 }
 static int __dlog_init(log_id_t log_id, log_priority prio, const char *tag, const char *msg)
 {
@@ -178,7 +159,6 @@ static int __dlog_init(log_id_t log_id, log_priority prio, const char *tag, cons
        // get filtering info
        // open device
        if (write_to_log == __dlog_init) {
-               init_dlog_level();
 
                log_fds[LOG_ID_MAIN] = open("/dev/"LOG_MAIN, O_WRONLY);
                log_fds[LOG_ID_RADIO] = open("/dev/"LOG_RADIO, O_WRONLY);
@@ -186,7 +166,6 @@ static int __dlog_init(log_id_t log_id, log_priority prio, const char *tag, cons
                log_fds[LOG_ID_APPS] = open("/dev/"LOG_APPS, O_WRONLY);
 
                if (log_fds[LOG_ID_MAIN] < 0 || log_fds[LOG_ID_RADIO] < 0) {
-                       fprintf(stderr, "open log dev is failed\n");
                        write_to_log = __write_to_log_null;
                } else {
 #ifdef SD_JOURNAL_SUPPORT
@@ -198,7 +177,6 @@ static int __dlog_init(log_id_t log_id, log_priority prio, const char *tag, cons
 
                if (log_fds[LOG_ID_SYSTEM] < 0)
                        log_fds[LOG_ID_SYSTEM] = log_fds[LOG_ID_MAIN];
-
                if (log_fds[LOG_ID_APPS] < 0)
                        log_fds[LOG_ID_APPS] = log_fds[LOG_ID_MAIN];
        }
@@ -209,6 +187,16 @@ static int __dlog_init(log_id_t log_id, log_priority prio, const char *tag, cons
 int __dlog_vprint(log_id_t log_id, int prio, const char *tag, const char *fmt, va_list ap)
 {
        char buf[LOG_BUF_SIZE];
+       if (!g_dlog_level_init) {
+               init_dlog_level();
+       }
+       if (log_id < LOG_ID_APPS) {
+               if(prio < g_dlog_level) {
+                       return 0;
+               }
+       } else if (LOG_ID_MAX <= log_id) {
+               return 0;
+       }
 
        vsnprintf(buf, LOG_BUF_SIZE, fmt, ap);
 
@@ -220,6 +208,17 @@ int __dlog_print(log_id_t log_id, int prio, const char *tag, const char *fmt, ..
        va_list ap;
        char buf[LOG_BUF_SIZE];
 
+       if (!g_dlog_level_init) {
+               init_dlog_level();
+       }
+       if (log_id < LOG_ID_APPS) {
+               if(prio < g_dlog_level) {
+                       return 0;
+               }
+       } else if (LOG_ID_MAX <= log_id) {
+               return 0;
+       }
+
        va_start(ap, fmt);
        vsnprintf(buf, LOG_BUF_SIZE, fmt, ap);
        va_end(ap);

diff --git a/logutil.c b/logutil.c
index df6e63e..b9f2813 100755 (executable)
--- a/logutil.c
+++ b/logutil.c
@@ -684,13 +684,13 @@ int main(int argc, char **argv)
                        exit(-1);
                }
        }
-
        if (0 == access("/dev/"LOGGER_LOG_APPS, accessmode)) {
                if (log_devices_add_to_tail(devices, log_devices_new("/dev/"LOGGER_LOG_APPS))) {
                        fprintf(stderr,"Can't add log device: %s\n", LOGGER_LOG_APPS);
                        exit(-1);
                }
        }
+
 /*
         // only add this if it's available
        int fd;

diff --git a/packaging/dlog.spec b/packaging/dlog.spec
index 329abe2..8fa6403 100755 (executable)
--- a/packaging/dlog.spec
+++ b/packaging/dlog.spec
@@ -1,7 +1,7 @@
 Name:       dlog
 Summary:    Logging service
 Version:    0.4.1
-Release:    2
+Release:    4
 Group:      System/Libraries
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -64,11 +64,8 @@ mkdir -p %{buildroot}/usr/bin/
 cp %{_builddir}/%{name}-%{version}/dlogctrl %{buildroot}/usr/bin/dlogctrl
 
 mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc3.d
-mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc5.d
 rm -f %{buildroot}/%{_sysconfdir}/etc/rc.d/rc3.d/S05dlog
-rm -f %{buildroot}/%{_sysconfdir}/etc/rc.d/rc5.d/S05dlog
 ln -s ../init.d/dlog.sh %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S05dlog
-ln -s ../init.d/dlog.sh %{buildroot}/%{_sysconfdir}/rc.d/rc5.d/S05dlog
 
 mkdir -p %{buildroot}%{_libdir}/systemd/system/basic.target.wants
 mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
@@ -111,7 +108,6 @@ systemctl daemon-reload
 %attr(775,root,root) %{_bindir}/dlogctrl
 %{_sysconfdir}/rc.d/init.d/dlog.sh
 %{_sysconfdir}/rc.d/rc3.d/S05dlog
-%{_sysconfdir}/rc.d/rc5.d/S05dlog
 %{_libdir}/systemd/system/tizen-debug-level.service
 %{_libdir}/systemd/system/dlog-main.service
 %{_libdir}/systemd/system/dlog-radio.service

diff --git a/packaging/tizen-debug-level.service b/packaging/tizen-debug-level.service
index 9f9f33e..ea9c420 100644 (file)
--- a/packaging/tizen-debug-level.service
+++ b/packaging/tizen-debug-level.service
@@ -3,7 +3,7 @@ Description=Set tizen debug level globally
 DefaultDependencies=no
 After=opt.mount
 Before=basic.target
-ConditionFileExists=/opt/etc/dlog/.platformloggingon
+ConditionFileExists=/opt/etc/dlog/.platformloggingmode
 
 [Service]
 Type=oneshot