diff --git a/services/hilogd/etc/BUILD.gn b/services/hilogd/etc/BUILD.gn index 4108d21a6b2ee6bbb8bb78f457e936d1bea2743c..ee5250d7dc080a00d652de675377071f37fe42c5 100644 --- a/services/hilogd/etc/BUILD.gn +++ b/services/hilogd/etc/BUILD.gn @@ -16,7 +16,7 @@ import("//build/ohos.gni") group("hilogd_etc") { deps = [ ":hilog_domains.conf", - ":hilogd.rc", + ":hilogd.cfg", ] } @@ -26,8 +26,12 @@ ohos_prebuilt_etc("hilog_domains.conf") { subsystem_name = "hiviewdfx" } -ohos_prebuilt_etc("hilogd.rc") { - source = "hilogd.rc" +ohos_prebuilt_etc("hilogd.cfg") { + if (use_musl) { + source = "hilogd.cfg" + } else { + source = "hilogd.rc" + } relative_install_dir = "init" part_name = "hilog_service" subsystem_name = "hiviewdfx" diff --git a/services/hilogd/etc/hilogd.cfg b/services/hilogd/etc/hilogd.cfg new file mode 100644 index 0000000000000000000000000000000000000000..943642957f04669e8b89e1ce804a36e1dd57b3fa --- /dev/null +++ b/services/hilogd/etc/hilogd.cfg @@ -0,0 +1,25 @@ +{ + "jobs" : [{ + "name" : "pre-init", + "cmds" : [ + "write /proc/sys/net/unix/max_dgram_qlen 600" + ] + }, { + "name" : "post-fs-data", + "cmds" : [ + "start hilogd" + ] + } + ], + "services" : [{ + "name" : "hilogd", + "path" : ["/system/bin/hilogd"], + "disabled" : 1, + "uid" : "logd", + "socket" : [ + "hilogInput dgram 0666 logd logd passcred", + "hilogControl seqpacket 0600 logd logd false" + ] + } + ] +} \ No newline at end of file diff --git a/services/hilogtool/log_controller.cpp b/services/hilogtool/log_controller.cpp index eb585a965b64fb792cb7df835873c63513301a3e..b89894934c9b7080a121cf4b4ff06374f9b3bc07 100644 --- a/services/hilogtool/log_controller.cpp +++ b/services/hilogtool/log_controller.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "hilog/log.h" #include "hilog_common.h" @@ -212,7 +212,8 @@ void LogQueryResponseOp(SeqPacketSocketClient& controller, char* recvBuffer, uin while(1) { memset_s(recvBuffer, bufLen, 0, bufLen); if (controller.RecvMsg(recvBuffer, bufLen) == 0) { - error(EXIT_FAILURE, 0, "Unexpected EOF"); + fprintf(stderr, "Unexpected EOF %s\n", strerror(errno)); + exit(1); return; } MessageHeader* msgHeader = &(rsp->header); diff --git a/services/hilogtool/main.cpp b/services/hilogtool/main.cpp index 39de63e863c9562c12777bccf417546bfc0231f7..774c62f56f25d44d801e9abae40215e1f6037dab 100644 --- a/services/hilogtool/main.cpp +++ b/services/hilogtool/main.cpp @@ -21,9 +21,9 @@ #include #include #include +#include #include #include -#include #include #include "hilog/log.h" @@ -558,7 +558,8 @@ int HilogEntry(int argc, char* argv[]) memset_s(recvBuffer, sizeof(recvBuffer), 0, sizeof(recvBuffer)); if (controller.RecvMsg(recvBuffer, RECV_BUF_LEN) == 0) { - error(EXIT_FAILURE, 0, "Unexpected EOF"); + fprintf(stderr, "Unexpected EOF %s\n", strerror(errno)); + exit(1); return 0; }