gfwleak/mesa-framework-mesa-handle-logger
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改日志不显示日志等级的问题

Browse Source
This commit is contained in:
guo_peixu
2022-07-01 19:01:10 +08:00
parent 5e17fced23
commit 0fb5b8adea
6 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
shm_consumer/MESA_shm_consumer.c
View File

@@ -11,6 +11,7 @@
#include <ctype.h>
#include <signal.h>
#include "list.h"
#include "MESA_handle_logger.h"
#include "MESA_shm_ring_queue.h"
#define DEFAUT_BUF_SIZE 256
@@ -245,13 +246,14 @@ int check_reopen_log_file(struct log_file_list *node)
}
/*
(int)file_len + (str)file + '\0' + (int)payload_len + (str)payload + '\0'
(int)file_len + (str)p_file + '\0' + (int)log_level + (int)payload_len + (str)payload + '\0'
*/
void consumer_ring_queue_to_file(struct MESA_shm_queue_head *head)
{
int *p_file_len = NULL;
int file_len = 0;
char *p_file = NULL;
int *p_level = NULL;
int *p_payload_len = NULL;
int payload_len = 0;
char *payload = NULL;
@@ -277,10 +279,11 @@ void consumer_ring_queue_to_file(struct MESA_shm_queue_head *head)
continue ;
}
}
p_payload_len = (int *)(p_file + file_len + 1);
p_level = (int *)(p_file + file_len + 1);
p_payload_len = p_level + 1;
payload_len = *p_payload_len;
payload = (char *)(p_payload_len + 1);
n = snprintf(buf, sizeof(buf), "%s, %s\n", strtime, payload);
n = snprintf(buf, sizeof(buf), "%s, %s, %s\n", strtime, loglevel_to_name(*p_level), payload);
write(node->fd, buf, n);
head->rd_idx = (head->rd_idx + 1) % head->blknum;
}
@@ -291,6 +294,7 @@ void consumer_ring_queue_to_terminal(struct MESA_shm_queue_head *head, int produ
int *p_file_len = NULL;
int file_len = 0;
char *p_file = NULL;
int *p_level = NULL;
int *p_payload_len = NULL;
int payload_len = 0;
char *payload = NULL;
@@ -300,11 +304,12 @@ void consumer_ring_queue_to_terminal(struct MESA_shm_queue_head *head, int produ
p_file_len = (int *)((char *)(head + 1) + (head->blksize * head->rd_idx));
file_len = *p_file_len;
p_file = (char *)(p_file_len + 1);
p_payload_len = (int *)(p_file + file_len + 1);
p_level = (int *)(p_file + file_len + 1);
p_payload_len = p_level + 1;
payload_len = *p_payload_len;
payload = (char *)(p_payload_len + 1);
n = snprintf(buf, sizeof(buf), "pid:%d, %s\n", producer_pid, payload);
if(g_cur_tty_fd > 0){
n = snprintf(buf, sizeof(buf), "pid:%d, %s, %s\n", producer_pid, loglevel_to_name(*p_level), payload);
if(g_cur_tty_fd >= 0){
write(g_cur_tty_fd, buf, n);
}
head->rd_idx = (head->rd_idx + 1) % head->blknum;