diff --git a/selftest/test/sysSentry/test_task.c b/selftest/test/sysSentry/test_task.c index 9549f1915cfe7fe6b25ced6c9e478c7d814520b2..d72046d956ddbc8ec499e32d269e5442aceb22f2 100644 --- a/selftest/test/sysSentry/test_task.c +++ b/selftest/test/sysSentry/test_task.c @@ -7,15 +7,16 @@ */ #include +#include #include #define SLEEP_TIME 10 int main(void) { - printf("-----test begin-----\n"); + syslog(LOG_INFO, "-----test begin-----\n"); sleep(SLEEP_TIME); - printf("-----test end -----\n"); + syslog(LOG_INFO, "-----test end -----\n"); return 0; -} \ No newline at end of file +} diff --git a/selftest/test/xalarm/reg_demo.c b/selftest/test/xalarm/reg_demo.c index 2f9824a95d5860fdfe015a474a00ba185a4a7b80..e2a387471a97b08f8f0d727046200d3eb4c0927e 100644 --- a/selftest/test/xalarm/reg_demo.c +++ b/selftest/test/xalarm/reg_demo.c @@ -4,6 +4,7 @@ */ #include #include +#include #include #include @@ -24,7 +25,7 @@ void RefreshOutput(void) { int ret = fflush(stdout); if (ret != 0) { - printf("failed to fflush\n"); + syslog(LOG_INFO, "failed to fflush\n"); } } @@ -40,7 +41,7 @@ void callback(struct alarm_info *param) alarmtime = xalarm_gettime(param); pucParas = xalarm_getdesc(param); - printf("[alarmid:%d] [alarmlevel:%d] [alarmtype:%d] [alarmtime:%lld ms] [msg:%s]\n", + syslog(LOG_INFO, "[alarmid:%d] [alarmlevel:%d] [alarmtype:%d] [alarmtime:%lld ms] [msg:%s]\n", alarmid, alarmlevel, alarmtype, alarmtime, pucParas); RefreshOutput(); @@ -53,7 +54,7 @@ int main(int argc, char **argv) int ret; struct alarm_subscription_info id_filter; - printf("demo start\n"); + syslog(LOG_INFO, "demo start\n"); id_filter.id_list[ID_INDEX_0] = ALARM_ID_1; id_filter.id_list[ID_INDEX_1] = ALARM_ID_2; @@ -67,17 +68,17 @@ int main(int argc, char **argv) clientId = xalarm_Register(callback, id_filter); } if (clientId < 0) { - printf("demo register failed\n"); + syslog(LOG_INFO, "demo register failed\n"); return -1; } else { - printf("xalarm register success, client id is %d\n", clientId); + syslog(LOG_INFO, "xalarm register success, client id is %d\n", clientId); } - printf("demo waiting alarm\n"); + syslog(LOG_INFO, "demo waiting alarm\n"); RefreshOutput(); sleep(SLEEP_TIME); xalarm_UnRegister(clientId); - printf("unregister xalarm success\n"); + syslog(LOG_INFO, "unregister xalarm success\n"); RefreshOutput(); return 0; } diff --git a/selftest/test/xalarm/unreg_demo.c b/selftest/test/xalarm/unreg_demo.c index 90638f3924790beedaa22fef3b0235b5fa99f147..f6a16776646f7ef5018a1188f3cdd6a129fcf654 100644 --- a/selftest/test/xalarm/unreg_demo.c +++ b/selftest/test/xalarm/unreg_demo.c @@ -4,6 +4,7 @@ */ #include #include +#include #include #include @@ -21,7 +22,7 @@ int main(int argc, char **argv) clientId = atoi(argv[CLIENT_ID_ARG_INDEX]); } - printf("unregister xalarm, client id is %d.", clientId); + syslog(LOG_INFO, "unregister xalarm, client id is %d.", clientId); xalarm_UnRegister(clientId); int ret = fflush(stdout); if (ret != 0) { diff --git a/selftest/test/xalarm/upgrade_demo.c b/selftest/test/xalarm/upgrade_demo.c index b2551fb2f56d2eeec366723221bf4ab61dbd0d75..552931ff3ced9417983ca4356da418711f0e5388 100644 --- a/selftest/test/xalarm/upgrade_demo.c +++ b/selftest/test/xalarm/upgrade_demo.c @@ -4,6 +4,7 @@ */ #include #include +#include #include #include @@ -20,7 +21,7 @@ void RefreshOutput(void) { int ret = fflush(stdout); if (ret != 0) { - printf("failed to fflush\n"); + syslog(LOG_INFO, "failed to fflush\n"); } } @@ -36,7 +37,7 @@ void Hook(struct alarm_info *param) alarmTime = xalarm_gettime(param); pucParas = xalarm_getdesc(param); - printf("alarmid:%d alarmlevel:%d alarmtype:%d alarmtime:%lld ms msg:%s\n", + syslog(LOG_INFO, "alarmid:%d alarmlevel:%d alarmtype:%d alarmtime:%lld ms msg:%s\n", alarmId, alarmLevel, alarmType, alarmTime, pucParas); RefreshOutput(); @@ -51,7 +52,7 @@ int main(int argc, char **argv) id_filter.len = ID_LIST_LENGTH; clientId = xalarm_Register(Hook, id_filter); if (clientId < 0) { - printf("demo register failed\n"); + syslog(LOG_INFO, "demo register failed\n"); return -1; } @@ -68,7 +69,7 @@ int main(int argc, char **argv) id_filter.id_list[i - ID_FILTER_BEGIN_INDEX] = atoi(argv[i]); } - printf("upgrade client id as %d", clientId); + syslog(LOG_INFO, "upgrade client id as %d", clientId); xalarm_Upgrade(id_filter, clientId); RefreshOutput(); diff --git a/src/libs/libxalarm/register_xalarm.c b/src/libs/libxalarm/register_xalarm.c index 1ddd0aeaae8a0d298b938c08784b84221fa210e7..f6d4525d2614356a9f5aa6ea7e6c08314d86c38a 100644 --- a/src/libs/libxalarm/register_xalarm.c +++ b/src/libs/libxalarm/register_xalarm.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -87,42 +88,42 @@ static int create_unix_socket(const char *path) int flags; if (path == NULL || path[0] == '\0') { - printf("create_unix_socket path is null"); + syslog(LOG_INFO, "create_unix_socket path is null"); return -1; } fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd < 0) { - printf("socket failed:%s\n", strerror(errno)); + syslog(LOG_INFO, "socket failed:%s\n", strerror(errno)); return -1; } flags = fcntl(fd, F_GETFL, 0); ret = fcntl(fd, F_SETFL, flags | O_NONBLOCK); if (ret == -1) { - printf("%s: fcntl setfl failed\n", __func__); + syslog(LOG_INFO, "%s: fcntl setfl failed\n", __func__); goto release_socket; } if (access(DIR_XALARM, F_OK) == -1) { if (mkdir(DIR_XALARM, ALARM_DIR_PERMISSION) == -1) { - printf("mkdir %s failed\n", DIR_XALARM); + syslog(LOG_INFO, "mkdir %s failed\n", DIR_XALARM); goto release_socket; } } if (memset(&alarm_addr, 0, sizeof(alarm_addr)) == NULL) { - printf("create_unix_socket: memset alarm_addr failed, ret: %d\n", ret); + syslog(LOG_INFO, "create_unix_socket: memset alarm_addr failed, ret: %d\n", ret); goto release_socket; } alarm_addr.sun_family = AF_UNIX; strncpy(alarm_addr.sun_path, path, sizeof(alarm_addr.sun_path) - 1); if (connect(fd, (struct sockaddr*)&alarm_addr, sizeof(alarm_addr)) == -1) { - printf("create_unix_socket: connect alarm_addr failed, ret: %d\n", ret); + syslog(LOG_INFO, "create_unix_socket: connect alarm_addr failed, ret: %d\n", ret); goto release_socket; } if (chmod(path, ALARM_SOCKET_PERMISSION) < 0) { - printf("chmod %s failed: %s\n", path, strerror(errno)); + syslog(LOG_INFO, "chmod %s failed: %s\n", path, strerror(errno)); goto release_socket; } @@ -143,7 +144,7 @@ static void *alarm_recv(void *arg) /* prctl does not return false if arg2 is right when arg1 is PR_SET_NAME */ ret = prctl(PR_SET_NAME, "register-recv"); if (ret != 0) { - printf("alarm_recv: prctl set thread name failed\n"); + syslog(LOG_INFO, "alarm_recv: prctl set thread name failed\n"); return NULL; } while (!g_register_info.thread_should_stop) { @@ -155,9 +156,9 @@ static void *alarm_recv(void *arg) usleep(RECV_DELAY_MSEC * TIME_UNIT_MILLISECONDS); continue; } - printf("recv error len:%d errno:%d\n", recvlen, errno); + syslog(LOG_INFO, "recv error len:%d errno:%d\n", recvlen, errno); } else if (recvlen == 0) { - printf("connection closed by xalarmd, maybe connections reach max num or service stopped.\n"); + syslog(LOG_INFO, "connection closed by xalarmd, maybe connections reach max num or service stopped.\n"); g_register_info.thread_should_stop = 1; break; } @@ -172,7 +173,7 @@ static pthread_t create_thread(void) ret = pthread_create(&t_id, NULL, alarm_recv, NULL); if (ret < 0) { - printf("create_thread: pthread_create error ret:%d\n", ret); + syslog(LOG_INFO, "create_thread: pthread_create error ret:%d\n", ret); t_id = ULONG_MAX; } return t_id; @@ -207,16 +208,16 @@ static bool alarm_subscription_verify(struct alarm_subscription_info id_filter) bool xalarm_Upgrade(struct alarm_subscription_info id_filter, int client_id) { if (!g_register_info.is_registered) { - printf("%s: alarm has not registered, cannot upgrade\n", __func__); + syslog(LOG_INFO, "%s: alarm has not registered, cannot upgrade\n", __func__); return false; } if (!alarm_subscription_verify(id_filter) || client_id != 0) { - printf("%s: invalid args\n", __func__); + syslog(LOG_INFO, "%s: invalid args\n", __func__); return false; } if (g_register_info.thread_should_stop) { - printf("%s: upgrade failed, alarm thread has stopped\n", __func__); + syslog(LOG_INFO, "%s: upgrade failed, alarm thread has stopped\n", __func__); return false; } set_alarm_id(id_filter); @@ -228,25 +229,25 @@ int xalarm_Register(alarm_callback_func callback, struct alarm_subscription_info { if (g_register_info.is_registered || (g_register_info.register_fd != -1) || (g_register_info.register_tid != ULONG_MAX)) { - printf("%s: alarm has registered\n", __func__); + syslog(LOG_INFO, "%s: alarm has registered\n", __func__); return -1; } if (!alarm_subscription_verify(id_filter) || callback == NULL) { - printf("%s: param is invalid\n", __func__); + syslog(LOG_INFO, "%s: param is invalid\n", __func__); return -1; } g_register_info.register_fd = create_unix_socket(PATH_REG_ALARM); if (g_register_info.register_fd == -1) { - printf("%s: create_unix_socket failed\n", __func__); + syslog(LOG_INFO, "%s: create_unix_socket failed\n", __func__); return -1; } g_register_info.thread_should_stop = 0; g_register_info.register_tid = create_thread(); if (g_register_info.register_tid == ULONG_MAX) { - printf("%s: create_thread failed\n", __func__); + syslog(LOG_INFO, "%s: create_thread failed\n", __func__); (void)close(g_register_info.register_fd); g_register_info.register_fd = -1; g_register_info.thread_should_stop = 1; @@ -262,12 +263,12 @@ int xalarm_Register(alarm_callback_func callback, struct alarm_subscription_info void xalarm_UnRegister(int client_id) { if (!g_register_info.is_registered) { - printf("%s: alarm has not registered\n", __func__); + syslog(LOG_INFO, "%s: alarm has not registered\n", __func__); return; } if (client_id != 0) { - printf("%s: invalid client\n", __func__); + syslog(LOG_INFO, "%s: invalid client\n", __func__); return; } diff --git a/src/sentryPlugins/cpu_sentry/catlib/cli_common.c b/src/sentryPlugins/cpu_sentry/catlib/cli_common.c index 598ecb2e513c55724a42c93f424ed14690416412..3a94dc03c78b4d560e2b2fdc3161d859e282336d 100644 --- a/src/sentryPlugins/cpu_sentry/catlib/cli_common.c +++ b/src/sentryPlugins/cpu_sentry/catlib/cli_common.c @@ -1,16 +1,17 @@ #include +#include #include "cli_common.h" void print_err_help() { - printf("See 'cat-cli "); + syslog(LOG_INFO, "See 'cat-cli "); PRINT_BLUE("--help"); - printf("'\n"); + syslog(LOG_INFO, "'\n"); } void print_opts_help() { - printf("usage: cat-cli [OPTIONS]\n" + syslog(LOG_INFO, "usage: cat-cli [OPTIONS]\n" "\n" "Options:\n" "-h, --help :Show the help message\n" diff --git a/src/sentryPlugins/cpu_sentry/catlib/cli_executor.c b/src/sentryPlugins/cpu_sentry/catlib/cli_executor.c index 6f4fbbdf68655c0e0ca1650a9e9e47863c8c7811..63512627ad448b8532e12f4fd1e5e2a9218fabd1 100644 --- a/src/sentryPlugins/cpu_sentry/catlib/cli_executor.c +++ b/src/sentryPlugins/cpu_sentry/catlib/cli_executor.c @@ -1,6 +1,7 @@ #define _GNU_SOURCE #include #include +#include #include "cpu_patrol.h" #include "cli_executor.h" @@ -9,7 +10,7 @@ static void print_cpu_set(cpu_set_t *cpu_set, ssize_t num_cpus, const char *pref bool is_begin_set = false; int begin_cpuid = -1; int end_cpuid = -1; - printf(prefix); + syslog(LOG_INFO, prefix); for (ssize_t i = 0; i < num_cpus; i++) { if (!CPU_ISSET(i, cpu_set)) { continue; @@ -26,18 +27,18 @@ static void print_cpu_set(cpu_set_t *cpu_set, ssize_t num_cpus, const char *pref } if (begin_cpuid == end_cpuid) { - printf("%u,", begin_cpuid); + syslog(LOG_INFO, "%u,", begin_cpuid); } else { - printf("%u-%u,", begin_cpuid, end_cpuid); + syslog(LOG_INFO, "%u-%u,", begin_cpuid, end_cpuid); } end_cpuid = i; begin_cpuid = end_cpuid; } if (begin_cpuid == end_cpuid) { - printf("%u\n", begin_cpuid); + syslog(LOG_INFO, "%u\n", begin_cpuid); } else { - printf("%u-%u\n", begin_cpuid, end_cpuid); + syslog(LOG_INFO, "%u-%u\n", begin_cpuid, end_cpuid); } } @@ -51,7 +52,7 @@ int execute_request(struct catcli_request_body *request_body) int ret = lib_cpu_patrol_start(request_body->module_params, request_body->cpu_utility, request_body->patrol_second, cpu_set); int count = __CPU_COUNT_S(size, cpu_set); - printf("cpu patrol execute %s, isolated cores: %d\n", ret == CAT_OK ? "ok" : "failed", count); + syslog(LOG_INFO, "cpu patrol execute %s, isolated cores: %d\n", ret == CAT_OK ? "ok" : "failed", count); char *prefix = ":"; if (count == 0) { puts(prefix); diff --git a/src/services/sentryCollector/ebpf_collector/ebpf_collector.c b/src/services/sentryCollector/ebpf_collector/ebpf_collector.c index 445cce769519345a79d70a97e9dfcae1a6350774..ecba8451efd9ab4231869540ad3a8af157e065e3 100644 --- a/src/services/sentryCollector/ebpf_collector/ebpf_collector.c +++ b/src/services/sentryCollector/ebpf_collector/ebpf_collector.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -196,7 +197,7 @@ static int print_map_res(int fd, char *stage, int map_size, int *io_dump) char *device_name = find_device_name(dev); logMessage(LOG_LEVEL_DEBUG, "device_name: %s, stage: %s, io_type: %c\n", device_name, stage, io_type); if (device_name && io_type) { - printf("%-7s %10llu %10llu %d %c %s\n", + syslog(LOG_INFO, "%-7s %10llu %10llu %d %c %s\n", stage, counter.finish_count, counter.duration,