diff options
| author | Alex Ray <aray@google.com> | 2014-03-08 01:56:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-08 01:56:12 +0000 |
| commit | f2d09863204fc04c7f030ce7adf51deb5de952ce (patch) | |
| tree | 2f56f19680a6e446f2d17a3dac63efdb76c22e8c | |
| parent | 6a58c4f342fa104fbabcd195561b90966f227a76 (diff) | |
| parent | 9f4d558e0c80602aa8707ec9d0bdd33a93aa4f16 (diff) | |
| download | system_core-f2d09863204fc04c7f030ce7adf51deb5de952ce.zip system_core-f2d09863204fc04c7f030ce7adf51deb5de952ce.tar.gz system_core-f2d09863204fc04c7f030ce7adf51deb5de952ce.tar.bz2 | |
am 9f4d558e: Merge "ueventd: easier debug logging"
* commit '9f4d558e0c80602aa8707ec9d0bdd33a93aa4f16':
ueventd: easier debug logging
| -rw-r--r-- | init/Android.mk | 5 | ||||
| -rw-r--r-- | init/log.h | 2 | ||||
| -rw-r--r-- | init/ueventd.c | 6 |
3 files changed, 11 insertions, 2 deletions
diff --git a/init/Android.mk b/init/Android.mk index 1f43ba6..740d10f 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -26,6 +26,9 @@ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) LOCAL_CFLAGS += -DALLOW_LOCAL_PROP_OVERRIDE=1 endif +# Enable ueventd logging +#LOCAL_CFLAGS += -DLOG_UEVENTS=1 + LOCAL_MODULE:= init LOCAL_FORCE_STATIC_EXECUTABLE := true @@ -42,6 +45,8 @@ LOCAL_STATIC_LIBRARIES := \ libmincrypt \ libext4_utils_static +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk + include $(BUILD_EXECUTABLE) # Make a symlink from /sbin/ueventd and /sbin/watchdogd to /init @@ -23,6 +23,4 @@ #define NOTICE(x...) KLOG_NOTICE("init", x) #define INFO(x...) KLOG_INFO("init", x) -#define LOG_UEVENTS 0 /* log uevent messages if 1. verbose */ - #endif diff --git a/init/ueventd.c b/init/ueventd.c index 3d01836..5517448 100644 --- a/init/ueventd.c +++ b/init/ueventd.c @@ -69,6 +69,12 @@ int ueventd_main(int argc, char **argv) open_devnull_stdio(); klog_init(); +#if LOG_UEVENTS + /* Ensure we're at a logging level that will show the events */ + if (klog_get_level() < KLOG_LEVEL_INFO) { + klog_set_level(KLOG_LEVEL_INFO); + } +#endif INFO("starting ueventd\n"); |