int log_level->enum UC_LOG_LEVEL

This commit is contained in:
Nils O. Selåsdal
2014-12-02 23:22:18 +01:00
parent 8c36756170
commit dd925b3654
2 changed files with 15 additions and 15 deletions
+10 -10
View File
@@ -30,8 +30,8 @@ enum UC_LOG_DESTINATION {
#define UC_MAX_RENAME_CNT (128)
//used to realise per destination settings
struct UCLogModule_setting {
int log_level;
struct UCLogModuleSetting {
enum UC_LOG_LEVEL log_level;
};
struct UCLogArgs;
@@ -41,10 +41,10 @@ struct UCLogDestination {
struct TailQ entry;
enum UC_LOG_DESTINATION dest_type;
//log level for this destination
int log_level;
enum UC_LOG_LEVEL log_level;
//Whether to log the source file name and line number
int log_location;
struct UCLogModule_setting *module_settings;
struct UCLogModuleSetting *module_settings;
union {
//for syslog openlog()
struct {
@@ -68,7 +68,7 @@ struct UCLogDestination {
struct UCLogArgs {
struct UCLogDestination *dest;
const struct UCLogModule *module;
int log_level;
enum UC_LOG_LEVEL log_level;
const char *location;
int raw;
};
@@ -176,7 +176,7 @@ static int uc_log_init_common(struct UCLogDestination *dest)
return rc;
}
struct UCLogDestination *uc_log_new_stderr(int log_level, int log_location)
struct UCLogDestination *uc_log_new_stderr(enum UC_LOG_LEVEL log_level, int log_location)
{
struct UCLogDestination *dest = calloc(1, sizeof *dest);
@@ -198,7 +198,7 @@ struct UCLogDestination *uc_log_new_stderr(int log_level, int log_location)
return dest;
}
struct UCLogDestination *uc_log_new_syslog(const char *ident, int facility, int log_level, int log_location)
struct UCLogDestination *uc_log_new_syslog(const char *ident, int facility, enum UC_LOG_LEVEL log_level, int log_location)
{
struct UCLogDestination *dest = calloc(1, sizeof *dest);
char *id;
@@ -231,7 +231,7 @@ struct UCLogDestination *uc_log_new_syslog(const char *ident, int facility, int
return dest;
}
struct UCLogDestination *uc_log_new_file(const char *filename, int log_level, int log_location)
struct UCLogDestination *uc_log_new_file(const char *filename, enum UC_LOG_LEVEL log_level, int log_location)
{
struct UCLogDestination *dest = calloc(1, sizeof *dest);
FILE *f;
@@ -679,7 +679,7 @@ static inline void uc_log_file_rotate_if_neeed(struct UCLogDestination *dest, ti
}
}
void uc_logf(int log_level, int module, int raw,
void uc_logf(enum UC_LOG_LEVEL log_level, int module, int raw,
const char *location, const char *fmt, ...)
{
va_list ap;
@@ -693,7 +693,7 @@ void uc_logf(int log_level, int module, int raw,
UC_TAILQ_FOREACH_CONTAINER(dest, entry, &g_destinations) {
const struct UCLogModule *log_module;
va_list apc;
int module_log_level;
enum UC_LOG_LEVEL module_log_level;
//destnation level