diff --git a/logmngr/Makefile b/logmngr/Makefile index 2a2496aa0..cfb929f7a 100644 --- a/logmngr/Makefile +++ b/logmngr/Makefile @@ -5,7 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=logmngr -PKG_VERSION:=1.0.7 +PKG_VERSION:=1.0.8 + LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git @@ -43,7 +44,7 @@ endef ifeq ($(LOCAL_DEV),1) define Build/Prepare - $(CP) -rf ./logmngr/* $(PKG_BUILD_DIR)/ + $(CP) -rf ~/git/logmngr/* $(PKG_BUILD_DIR)/ endef endif diff --git a/logmngr/files/lib/logmngr/syslog-ng.sh b/logmngr/files/lib/logmngr/syslog-ng.sh index d782a53a2..311abaf1d 100644 --- a/logmngr/files/lib/logmngr/syslog-ng.sh +++ b/logmngr/files/lib/logmngr/syslog-ng.sh @@ -44,7 +44,8 @@ create_input_section() { # on any uci value echo -e "source $tag {" >> ${TMP_CONF_FILE} echo -e "\tinternal();" >> ${TMP_CONF_FILE} - echo -e "\tunix-dgram("/dev/log");" >> ${TMP_CONF_FILE} + echo -e "\tunix-dgram(\"/dev/log\");" >> ${TMP_CONF_FILE} + echo -e "\tfile(\"/proc/kmsg\" program_override(\"kernel\"));" >> ${TMP_CONF_FILE} echo "};" >> ${TMP_CONF_FILE} } @@ -326,8 +327,6 @@ apply_config_file() { cp ${TMP_CONF_FILE} ${CONF_FILE} } -PROG=/usr/sbin/syslog-ng-ctl - logmngr_init() { create_config_file @@ -347,7 +346,9 @@ logmngr_init() { logrotate_init fi - procd_open_instance logmngr - procd_set_param command $PROG reload - procd_close_instance + if procd_running 'syslog-ng'; then + /etc/init.d/syslog-ng reload + else + /etc/init.d/syslog-ng start + fi } diff --git a/logmngr/files/logmngr.init b/logmngr/files/logmngr.init index af7a82530..fbed2196b 100644 --- a/logmngr/files/logmngr.init +++ b/logmngr/files/logmngr.init @@ -1,7 +1,7 @@ #!/bin/sh /etc/rc.common START=12 -STOP=89 + USE_PROCD=1 . /lib/functions.sh