pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

logger can log header line

pull/1/head
yuqing 2014-06-17 11:34:13 +08:00
parent f11b5a1f07
commit cfe46a63ed
3 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -9,6 +9,7 @@ Version 1.06 2014-06-17
* add get_url_content_ex to support buffer passed by caller
* logger can set rotate time format
* add connection pool
* logger can log header line
Version 1.05 2012-07-08
* update source code from FastDFS V3.09

42
src/logger.c
View File

@ -113,6 +113,10 @@ static int log_open(LogContext *pContext)
pContext->log_filename, errno, STRERROR(errno));
return errno != 0 ? errno : EACCES;
}
if (pContext->current_size == 0 && pContext->print_header_callback != NULL)
{
pContext->print_header_callback(pContext);
}
return 0;
}
@ -156,6 +160,20 @@ void log_set_rotate_time_format(LogContext *pContext, const char *time_format)
"%s", time_format);
}
void log_set_header_callback(LogContext *pContext, LogHeaderCallback header_callback)
{
pContext->print_header_callback = header_callback;
if (pContext->print_header_callback != NULL)
{
pthread_mutex_lock(&(pContext->log_thread_lock));
if (pContext->current_size == 0)
{
pContext->print_header_callback(pContext);
}
pthread_mutex_unlock(&(pContext->log_thread_lock));
}
}
void log_destroy_ex(LogContext *pContext)
{
if (pContext->log_fd >= 0 && pContext->log_fd != STDERR_FILENO)
@ -356,7 +374,7 @@ static int log_fsync(LogContext *pContext, const bool bNeedLock)
static void doLogEx(LogContext *pContext, struct timeval *tv, \
const char *caption, const char *text, const int text_len, \
const bool bNeedSync)
const bool bNeedSync, const bool bNeedLock)
{
struct tm tm;
int time_fragment;
@ -380,7 +398,7 @@ static void doLogEx(LogContext *pContext, struct timeval *tv, \
}
localtime_r(&tv->tv_sec, &tm);
if ((result=pthread_mutex_lock(&pContext->log_thread_lock)) != 0)
if (bNeedLock && (result=pthread_mutex_lock(&pContext->log_thread_lock)) != 0)
{
fprintf(stderr, "file: "__FILE__", line: %d, " \
"call pthread_mutex_lock fail, " \
@ -393,7 +411,10 @@ static void doLogEx(LogContext *pContext, struct timeval *tv, \
fprintf(stderr, "file: "__FILE__", line: %d, " \
"log buff size: %d < log text length: %d ", \
__LINE__, LOG_BUFF_SIZE, text_len + 64);
pthread_mutex_unlock(&(pContext->log_thread_lock));
if (bNeedLock)
{
pthread_mutex_unlock(&(pContext->log_thread_lock));
}
return;
}
@ -433,7 +454,7 @@ static void doLogEx(LogContext *pContext, struct timeval *tv, \
log_fsync(pContext, false);
}
if ((result=pthread_mutex_unlock(&(pContext->log_thread_lock))) != 0)
if (bNeedLock && (result=pthread_mutex_unlock(&(pContext->log_thread_lock))) != 0)
{
fprintf(stderr, "file: "__FILE__", line: %d, " \
"call pthread_mutex_unlock fail, " \
@ -443,7 +464,8 @@ static void doLogEx(LogContext *pContext, struct timeval *tv, \
}
void log_it_ex2(LogContext *pContext, const char *caption, \
const char *text, const int text_len, const bool bNeedSync)
const char *text, const int text_len, \
const bool bNeedSync, const bool bNeedLock)
{
struct timeval tv;
@ -457,7 +479,7 @@ void log_it_ex2(LogContext *pContext, const char *caption, \
gettimeofday(&tv, NULL);
}
doLogEx(pContext, &tv, caption, text, text_len, bNeedSync);
doLogEx(pContext, &tv, caption, text, text_len, bNeedSync, bNeedLock);
}
void log_it_ex1(LogContext *pContext, const int priority, \
@ -506,7 +528,7 @@ void log_it_ex1(LogContext *pContext, const int priority, \
break;
}
log_it_ex2(pContext, caption, text, text_len, bNeedSync);
log_it_ex2(pContext, caption, text, text_len, bNeedSync, true);
}
void log_it_ex(LogContext *pContext, const int priority, const char *format, ...)
@ -561,7 +583,7 @@ void log_it_ex(LogContext *pContext, const int priority, const char *format, ...
break;
}
log_it_ex2(pContext, caption, text, len, bNeedSync);
log_it_ex2(pContext, caption, text, len, bNeedSync, true);
}
@ -581,7 +603,7 @@ void log_it_ex(LogContext *pContext, const int priority, const char *format, ...
va_end(ap); \
} \
\
log_it_ex2(pContext, caption, text, len, bNeedSync); \
log_it_ex2(pContext, caption, text, len, bNeedSync, true); \
void logEmergEx(LogContext *pContext, const char *format, ...)
@ -635,7 +657,7 @@ void logAccess(LogContext *pContext, struct timeval *tvStart, \
len = vsnprintf(text, sizeof(text), format, ap);
va_end(ap);
doLogEx(pContext, tvStart, NULL, text, len, false);
doLogEx(pContext, tvStart, NULL, text, len, false, true);
}
#ifndef LOG_FORMAT_CHECK

22
src/logger.h
View File

@ -22,6 +22,11 @@ extern "C" {
#define LOG_TIME_PRECISION_MSECOND 'm' //millisecond
#define LOG_TIME_PRECISION_USSECOND 'u' //microsecond
struct log_context;
//log header line callback
typedef void (*LogHeaderCallback)(struct log_context *pContext);
typedef struct log_context
{
/* log level value please see: sys/syslog.h
@ -66,6 +71,11 @@ typedef struct log_context
* default: %Y%m%d_%H%M%S
* */
char rotate_time_format[32];
/*
* log the header (title line) callback
* */
LogHeaderCallback print_header_callback;
} LogContext;
extern LogContext g_log_context;
@ -135,6 +145,15 @@ void log_set_time_precision(LogContext *pContext, const int time_precision);
*/
void log_set_rotate_time_format(LogContext *pContext, const char *time_format);
/** set print header callback
* parameters:
* pContext: the log context
* header_callback: the callback
* return: none
*/
void log_set_header_callback(LogContext *pContext, LogHeaderCallback header_callback);
/** destroy function
* parameters:
* pContext: the log context
@ -175,7 +194,8 @@ void log_it_ex1(LogContext *pContext, const int priority, \
* return: none
*/
void log_it_ex2(LogContext *pContext, const char *caption, \
const char *text, const int text_len, const bool bNeedSync);
const char *text, const int text_len, \
const bool bNeedSync, const bool bNeedLock);
/** sync log buffer to log file