From ea5a9a7ea7dc79e9144bb9d084d766eda6e46284 Mon Sep 17 00:00:00 2001
From: lzz <xiguabobo_2020@qq.com>
Date: 星期五, 01 十一月 2024 12:09:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Server/马丽萍/code/log/log.h | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git "a/Server/\351\251\254\344\270\275\350\220\215/code/log/log.h" "b/Server/\351\251\254\344\270\275\350\220\215/code/log/log.h"
index be28a84..83df983 100644
--- "a/Server/\351\251\254\344\270\275\350\220\215/code/log/log.h"
+++ "b/Server/\351\251\254\344\270\275\350\220\215/code/log/log.h"
@@ -3,12 +3,12 @@
#include <stdio.h>
#include <iostream>
-#include <string>
#include <stdarg.h>
-#include <thread>
+#include <thread>
#include "block_queue.h"
-#include "locker.h" // 纭繚 locker.h 琚寘鍚�
+#include "locker.h"
#include <fstream>
+#include <sqlite3.h> // 娣诲姞 SQLite 鏁版嵁搴撶殑澶存枃浠�
using namespace std;
@@ -22,10 +22,12 @@
// 瀛樺偍瑙ｆ瀽鏃ュ織鏂囦欢鐨勭粨鏋勪綋
struct ParsedLog {
- std::string timestamp; // 鏃堕棿鎴�
- std::string device_id; // 璁惧ID
- std::string level; // 鏃ュ織绾у埆
- std::string content; // 鏃ュ織鍐呭
+ char timestamp[64]; // 鏃堕棿鎴�
+ char device_id[64]; // 璁惧ID
+ char level[16]; // 鏃ュ織绾у埆
+ char content[256]; // 鏃ュ織鍐呭
+ char source[64]; // 鏉ユ簮妯″潡
+ char user_id[64]; // 鐢ㄦ埛ID
};
class Log
@@ -42,17 +44,19 @@
void flush_log_thread(); // 淇敼涓洪潪闈欐�佹垚鍛樺嚱鏁�
// 鍒濆鍖栨棩蹇楃郴缁燂紝鍙傛暟鍖呮嫭鏂囦欢鍚嶃�佹槸鍚﹀叧闂棩蹇椼�佺紦鍐插尯澶у皬銆佹渶澶ц鏁板拰鏈�澶ч槦鍒楀ぇ灏�
- bool Log::init(const char *file_name, int close_log, int log_buf_size, int split_lines, int max_queue_size);
+ bool init(const char *file_name, int close_log, int log_buf_size, int split_lines, int max_queue_size);
-
// 鍐欏叆鏃ュ織
void write_log(int level, const char *format, ...);
// 鍒锋柊鏃ュ織鏂囦欢
void flush(void);
- //鎺ユ敹鍘熷鐨勮鍏叡绫�
- void receiveLog(const std::string& raw_log); // 鎺ユ敹鍘熷鏃ュ織
+ // 鎺ユ敹鍘熷鏃ュ織
+ void receiveLog(const char* raw_log);
+
+ // 灏嗘棩蹇楀啓鍏ユ暟鎹簱
+ void writeLogToDatabase(const ParsedLog& log);
private:
Log(); // 鏋勯�犲嚱鏁�
@@ -62,12 +66,12 @@
bool check_log_size(); // 妫�鏌ユ棩蹇楁枃浠跺ぇ灏�
void rotate_logs(); // 杞崲鏃ュ織鏂囦欢
- ParsedLog parseLog(const std::string& log); // 瑙ｆ瀽鏃ュ織
- bool init(const std::string &file_name, int close_log, int log_buf_size, int split_lines, int max_queue_size);
- void queryLogs(const std::string &device_id); // 鏌ヨ鏃ュ織
+ ParsedLog parseLog(const char* log); // 瑙ｆ瀽鏃ュ織
+ bool init(const char *file_name, int close_log, int log_buf_size, int split_lines, int max_queue_size);
+ void queryLogs(const char *device_id); // 鏌ヨ鏃ュ織
const char* log_level_to_string(int level); // 灏嗘棩蹇楃骇鍒浆鎹负瀛楃涓�
- int levelToInt(const std::string &level);
+ int levelToInt(const char *level);
private:
char dir_name[128]; // 鏃ュ織鏂囦欢鐩綍
@@ -78,16 +82,18 @@
int m_today; // 璁板綍褰撳墠鏃堕棿
std::ofstream m_fp; // 灏� FILE * m_fp 鏇存敼涓� std::ofstream m_fp
char *m_buf; // 鏃ュ織缂撳啿鍖�
- block_queue<string> *m_log_queue; // 闃诲闃熷垪
+ block_queue<char*> *m_log_queue; // 闃诲闃熷垪
bool m_is_async; // 鏄惁寮傛鏍囧織浣�
locker m_mutex; // 浜掓枼閿�
int m_close_log; // 鍏抽棴鏃ュ織鐨勬爣蹇�
- long max_size = 10 * 1024 * 1024; // 10MB
- //娴嬭瘯鏂囦欢閲岄潰鐨�
- int m_close_log; // 纭繚鍦ㄨ繖閲屽畾涔�
+ long max_size = 10 * 1024 * 1024; // 鍗曚釜鏃ュ織鏂囦欢鐨勫ぇ灏� 10MB
+
+ // 鏁版嵁搴撶浉鍏�
+ sqlite3 *db; // SQLite 鏁版嵁搴撴寚閽�
+ void openDatabase(const char *db_name); // 鎵撳紑鏁版嵁搴�
+ void closeDatabase(); // 鍏抽棴鏁版嵁搴�
};
-// 瀹忓畾涔夌敤浜庝笉鍚岀骇鍒殑鏃ュ織璁板綍
#define LOG_DEBUG(format, ...) if(0 == m_close_log) {Log::get_instance()->write_log(DEBUG, format, ##__VA_ARGS__); Log::get_instance()->flush();}
#define LOG_INFO(format, ...) if(0 == m_close_log) {Log::get_instance()->write_log(INFO, format, ##__VA_ARGS__); Log::get_instance()->flush();}
#define LOG_WARN(format, ...) if(0 == m_close_log) {Log::get_instance()->write_log(WARN, format, ##__VA_ARGS__); Log::get_instance()->flush();}
--
Gitblit v1.8.0