From 1fea4c3b112aefc7076092b34eeec7de1a67a50c Mon Sep 17 00:00:00 2001
From: wangky <m1561510467@163.com>
Date: 星期五, 01 十一月 2024 15:25:04 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Server/马丽萍/code/log/log.cpp | 209 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 167 insertions(+), 42 deletions(-)
diff --git "a/Server/\351\251\254\344\270\275\350\220\215/code/log/log.cpp" "b/Server/\351\251\254\344\270\275\350\220\215/code/log/log.cpp"
index 9a0dbea..3c6e62c 100644
--- "a/Server/\351\251\254\344\270\275\350\220\215/code/log/log.cpp"
+++ "b/Server/\351\251\254\344\270\275\350\220\215/code/log/log.cpp"
@@ -1,21 +1,14 @@
-#include <string.h>
#include <time.h>
#include <chrono>
-#include <ctime>
#include <stdarg.h>
#include "log.h"
-#include <sstream>
#include <fstream>
#include <iostream>
-#include <chrono>
using namespace std;
// 鏋勯�犲嚱鏁�
-Log::Log() {
- m_count = 0; // 鍒濆鍖栨棩蹇楄鏁�
- m_is_async = false; // 鍒濆鍖栦负鍚屾
-}
+Log::Log() : m_count(0), m_is_async(false) {}
// 鏋愭瀯鍑芥暟
Log::~Log() {
@@ -24,31 +17,82 @@
}
}
-// 鎺ユ敹鍘熷鏃ュ織骞惰В鏋�
-void Log::receiveLog(const std::string &raw_log) {
- ParsedLog parsed_log = parseLog(raw_log);
- write_log(levelToInt(parsed_log.level), "%s [%s] %s", parsed_log.timestamp.c_str(), parsed_log.device_id.c_str(), parsed_log.content.c_str());
+//寮傛鍐欏叆
+void Log::async_write_log() {
+ while (m_is_async) {
+ char* log;
+ if (m_log_queue->pop(log)) {
+ ParsedLog parsed_log = parseLog(log);
+ write_log(INFO, "%s", log); // 鍏堝啓鍏ユ棩蹇楁枃浠�
+ writeLogToDatabase(parsed_log); // 鍐嶅啓鍏ユ暟鎹簱
+ delete[] log; // 閲婃斁鍐呭瓨
+ }
+ }
}
+bool Log::check_log_size() {
+ if (m_fp.tellp() >= max_size) {
+ rotate_logs(); // 濡傛灉鏃ュ織鏂囦欢澶у皬瓒呰繃鏈�澶у�硷紝杞崲鏃ュ織
+ return true;
+ }
+ return false;
+}
+
+
+// 鎺ユ敹鍘熷鏃ュ織骞惰В鏋�
+void Log::receiveLog(const char* raw_log) {
+ ParsedLog parsed_log = parseLog(raw_log);
+ write_log(levelToInt(parsed_log.level), "%s [%s] %s",
+ parsed_log.timestamp,
+ parsed_log.device_id,
+ parsed_log.content);
+}
+
+//鍐欏叆鏁版嵁搴�
+void Log::writeLogToDatabase(const ParsedLog& log) {
+ const char* sql = "INSERT INTO parsed_logs (timestamp, device_id, level, content, source, user_id) VALUES (?, ?, ?, ?, ?, ?)";
+ sqlite3_stmt* stmt;
+
+ if (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL) != SQLITE_OK) {
+ cerr << "Error: Failed to prepare statement: " << sqlite3_errmsg(db) << endl;
+ return;
+ }
+
+ sqlite3_bind_text(stmt, 1, log.timestamp, -1, SQLITE_STATIC);
+ sqlite3_bind_text(stmt, 2, log.device_id, -1, SQLITE_STATIC);
+ sqlite3_bind_text(stmt, 3, log.level, -1, SQLITE_STATIC);
+ sqlite3_bind_text(stmt, 4, log.content, -1, SQLITE_STATIC);
+ sqlite3_bind_text(stmt, 5, log.source, -1, SQLITE_STATIC);
+ sqlite3_bind_text(stmt, 6, log.user_id, -1, SQLITE_STATIC);
+
+ if (sqlite3_step(stmt) != SQLITE_DONE) {
+ cerr << "Error: Failed to execute statement: " << sqlite3_errmsg(db) << endl;
+ }
+
+ sqlite3_finalize(stmt); // 娓呯悊鍑嗗璇彞
+}
+
+
// 瑙ｆ瀽鏃ュ織瀛楃涓�
-ParsedLog Log::parseLog(const std::string &log) {
+ParsedLog Log::parseLog(const char* log) {
ParsedLog parsed_log;
- std::istringstream iss(log);
- std::string level;
+ char level[16];
// 璇诲彇鏃堕棿鎴炽�佽澶嘔D鍜屾棩蹇楃骇鍒�
- iss >> parsed_log.timestamp >> parsed_log.device_id >> level;
- std::getline(iss, parsed_log.content);
- parsed_log.level = level; // 璁剧疆瑙ｆ瀽鍚庣殑绾у埆
+ sscanf(log, "%s %s %s %[^\n]", parsed_log.timestamp, parsed_log.device_id, level, parsed_log.content);
+ // 璁剧疆瑙ｆ瀽鍚庣殑绾у埆
+ for (int i = 0; i < 16; ++i) {
+ parsed_log.level[i] = level[i];
+ }
return parsed_log;
}
// 鍒濆鍖栨棩蹇楃郴缁�
-bool Log::init(const std::string &file_name, int close_log, int log_buf_size, int split_lines, int max_queue_size) {
+bool Log::init(const char* file_name, int close_log, int log_buf_size, int split_lines, int max_queue_size) {
if (max_queue_size >= 1) {
m_is_async = true; // 鍚敤寮傛鍐欏叆
- m_log_queue = new block_queue<string>(max_queue_size); // 鍒涘缓闃诲闃熷垪
+ m_log_queue = new block_queue<char*>(max_queue_size); // 鍒涘缓闃诲闃熷垪
std::thread(&Log::flush_log_thread, this).detach(); // 鍒涘缓鍒锋柊鏃ュ織绾跨▼
}
@@ -60,43 +104,76 @@
time_t t = time(NULL);
struct tm *sys_tm = localtime(&t);
- std::string log_full_name;
+ char log_full_name[256];
// 鏍规嵁鏂囦欢璺緞鍜屽綋鍓嶆棩鏈熺敓鎴愬畬鏁存棩蹇楁枃浠跺悕
- if (file_name.find('/') == std::string::npos) {
- log_full_name = to_string(sys_tm->tm_year + 1900) + "_" + to_string(sys_tm->tm_mon + 1) + "_" + to_string(sys_tm->tm_mday) + "_" + file_name;
+ if (strchr(file_name, '/') == nullptr) {
+ sprintf(log_full_name, "%d_%d_%d_%s",
+ sys_tm->tm_year + 1900, sys_tm->tm_mon + 1, sys_tm->tm_mday, file_name);
} else {
- std::string log_name = file_name.substr(file_name.find_last_of('/') + 1);
- std::string dir_name = file_name.substr(0, file_name.find_last_of('/') + 1);
-
- log_full_name = dir_name + to_string(sys_tm->tm_year + 1900) + "_" + to_string(sys_tm->tm_mon + 1) + "_" + to_string(sys_tm->tm_mday) + "_" + log_name;
+ char log_name[128];
+ char dir_name[128];
+ char* last_slash = strrchr(file_name, '/');
+ int dir_len = last_slash - file_name + 1;
+ strncpy(dir_name, file_name, dir_len);
+ dir_name[dir_len] = '\0';
+ strcpy(log_name, last_slash + 1);
+
+ sprintf(log_full_name, "%s%d_%d_%d_%s",
+ dir_name, sys_tm->tm_year + 1900, sys_tm->tm_mon + 1, sys_tm->tm_mday, log_name);
}
m_today = sys_tm->tm_mday; // 璁板綍浠婂ぉ鐨勬棩鏈�
m_fp.open(log_full_name, std::ios::out | std::ios::app); // 鎵撳紑鏃ュ織鏂囦欢
if (!m_fp.is_open()) {
+ cerr << "Error: Could not open log file: " << log_full_name << endl;
return false; // 鎵撳紑澶辫触
}
return true; // 鍒濆鍖栨垚鍔�
}
-#include <chrono>
+//鏌ヨ鏃ュ織鑽夋渶
+void Log::queryLogs(const char *device_id) {
+ const char* sql = "SELECT * FROM parsed_logs WHERE device_id = ?";
+ sqlite3_stmt* stmt;
+ if (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL) != SQLITE_OK) {
+ cerr << "Error: Failed to prepare statement: " << sqlite3_errmsg(db) << endl;
+ return;
+ }
+
+ sqlite3_bind_text(stmt, 1, device_id, -1, SQLITE_STATIC);
+
+ while (sqlite3_step(stmt) == SQLITE_ROW) {
+ cout << "Timestamp: " << sqlite3_column_text(stmt, 1) << ", "
+ << "Device ID: " << sqlite3_column_text(stmt, 2) << ", "
+ << "Level: " << sqlite3_column_text(stmt, 3) << ", "
+ << "Content: " << sqlite3_column_text(stmt, 4) << ", "
+ << "Source: " << sqlite3_column_text(stmt, 5) << ", "
+ << "User ID: " << sqlite3_column_text(stmt, 6) << endl;
+ }
+
+ sqlite3_finalize(stmt); // 娓呯悊鍑嗗璇彞
+}
+
+
+
+// 鍐欏叆鏃ュ織
void Log::write_log(int level, const char *format, ...) {
auto now = std::chrono::system_clock::now();
auto now_time_t = std::chrono::system_clock::to_time_t(now);
struct tm *sys_tm = localtime(&now_time_t);
- std::string s;
+ char s[32];
// 鏍规嵁鏃ュ織绾у埆璁剧疆鍓嶇紑
switch (level) {
- case DEBUG: s = "[debug]: "; break;
- case INFO: s = "[info]: "; break;
- case WARN: s = "[warn]: "; break;
- case ERROR: s = "[error]: "; break;
- default: s = "[info]: "; break;
+ case DEBUG: strcpy(s, "[debug]: "); break;
+ case INFO: strcpy(s, "[info]: "); break;
+ case WARN: strcpy(s, "[warn]: "); break;
+ case ERROR: strcpy(s, "[error]: "); break;
+ default: strcpy(s, "[info]: "); break;
}
m_mutex.lock(); // 閿佸畾浜掓枼浣�
@@ -104,7 +181,7 @@
// 妫�鏌ユ槸鍚﹂渶瑕佽疆鎹㈡棩蹇�
if (m_today != sys_tm->tm_mday || m_count % m_split_lines == 0) {
- // ... (鏃ュ織杞崲浠ｇ爜)
+ rotate_logs(); // 璋冪敤鏃ュ織杞崲鍑芥暟
}
// 鍐欏叆鏃ュ織鍐呭
@@ -113,6 +190,7 @@
vsnprintf(m_buf, m_log_buf_size, format, valist); // 鍐欏叆鏃ュ織鍐呭
m_fp << s << m_buf << std::endl; // 浣跨敤ofstream鍐欏叆鏂囦欢
+ va_end(valist);
m_mutex.unlock(); // 瑙ｉ攣浜掓枼浣�
@@ -133,18 +211,65 @@
void Log::flush_log_thread() {
while (m_is_async) {
// 浠庨槦鍒椾腑鑾峰彇鏃ュ織骞跺啓鍏�
- string log;
+ char* log;
if (m_log_queue->pop(log)) {
- write_log(INFO, "%s", log.c_str());
+ write_log(INFO, "%s", log);
}
}
}
+//杞崲瀛楃涓�
+const char* Log::log_level_to_string(int level) {
+ switch (level) {
+ case DEBUG: return "[debug]: ";
+ case INFO: return "[info]: ";
+ case WARN: return "[warn]: ";
+ case ERROR: return "[error]: ";
+ default: return "[info]: "; // 榛樿杩斿洖INFO
+ }
+}
+
// 鏃ュ織绾у埆杞崲涓烘暣鏁�
-int Log::levelToInt(const std::string &level) {
- if (level == "[debug]:") return DEBUG;
- if (level == "[info]:") return INFO;
- if (level == "[warn]:") return WARN;
- if (level == "[error]:") return ERROR;
+int Log::levelToInt(const char* level) {
+ if (strcmp(level, "[debug]:") == 0) return DEBUG;
+ if (strcmp(level, "[info]:") == 0) return INFO;
+ if (strcmp(level, "[warn]:") == 0) return WARN;
+ if (strcmp(level, "[error]:") == 0) return ERROR;
return INFO; // 榛樿杩斿洖INFO
}
+
+//鎵撳紑鍏抽棴鏁版嵁搴�
+void Log::openDatabase(const char *db_name) {
+ if (sqlite3_open(db_name, &db) != SQLITE_OK) {
+ cerr << "鎵撲笉寮�鏁版嵁搴擄紒锛侀敊璇細 " << sqlite3_errmsg(db) << endl;
+ }
+}
+
+void Log::closeDatabase() {
+ if (db) {
+ sqlite3_close(db);
+ }
+}
+
+// 鏃ュ織杞崲鍑芥暟
+void Log::rotate_logs() {
+ // 鍏抽棴褰撳墠鏂囦欢
+ m_fp.close();
+
+ // 鐢熸垚鏂版枃浠跺悕
+ time_t t = time(NULL);
+ struct tm *sys_tm = localtime(&t);
+ char new_log_name[256];
+ sprintf(new_log_name, "%d_%d_%d_log.txt",
+ sys_tm->tm_year + 1900, sys_tm->tm_mon + 1, sys_tm->tm_mday);
+
+ // 鎵撳紑鏂扮殑鏃ュ織鏂囦欢
+ m_fp.open(new_log_name, std::ios::out | std::ios::app);
+ if (!m_fp.is_open()) {
+ cerr << "Error: Could not open new log file: " << new_log_name << endl;
+ return;
+ }
+
+ m_today = sys_tm->tm_mday; // 鏇存柊浠婂ぉ鐨勬棩鏈�
+ m_count = 0; // 閲嶇疆鏃ュ織璁℃暟
+}
--
Gitblit v1.8.0