projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure: Link with ip4tc and ip6tc, too.
[collectd.git]
/
src
/
logfile.c
diff --git
a/src/logfile.c
b/src/logfile.c
index
71ddec6
..
6d0f6e0
100644
(file)
--- a/
src/logfile.c
+++ b/
src/logfile.c
@@
-39,14
+39,14
@@
static pthread_mutex_t file_lock = PTHREAD_MUTEX_INITIALIZER;
static char *log_file = NULL;
static int print_timestamp = 1;
static char *log_file = NULL;
static int print_timestamp = 1;
-static int print_
level
= 0;
+static int print_
severity
= 0;
static const char *config_keys[] =
{
"LogLevel",
"File",
"Timestamp",
static const char *config_keys[] =
{
"LogLevel",
"File",
"Timestamp",
- "Print
Level
"
+ "Print
Severity
"
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
@@
-80,11
+80,11
@@
static int logfile_config (const char *key, const char *value)
print_timestamp = 0;
else
print_timestamp = 1;
print_timestamp = 0;
else
print_timestamp = 1;
- } else if (0 == strcasecmp(key, "Print
Level
")) {
+ } else if (0 == strcasecmp(key, "Print
Severity
")) {
if (IS_FALSE (value))
if (IS_FALSE (value))
- print_
level
= 0;
+ print_
severity
= 0;
else
else
- print_
level
= 1;
+ print_
severity
= 1;
}
else {
return -1;
}
else {
return -1;
@@
-98,26
+98,26
@@
static void logfile_print (const char *msg, int severity, time_t timestamp_time)
int do_close = 0;
struct tm timestamp_tm;
char timestamp_str[64];
int do_close = 0;
struct tm timestamp_tm;
char timestamp_str[64];
- char level_str[16];
+ char level_str[16]
= ""
;
- if (print_
level
)
+ if (print_
severity
)
{
switch (severity)
{
case LOG_ERR:
{
switch (severity)
{
case LOG_ERR:
- snprintf(level_str,
15
, "[error] ");
+ snprintf(level_str,
sizeof (level_str)
, "[error] ");
break;
case LOG_WARNING:
break;
case LOG_WARNING:
- snprintf(level_str,
15
, "[warning] ");
+ snprintf(level_str,
sizeof (level_str)
, "[warning] ");
break;
case LOG_NOTICE:
break;
case LOG_NOTICE:
- snprintf(level_str,
15
, "[notice] ");
+ snprintf(level_str,
sizeof (level_str)
, "[notice] ");
break;
case LOG_INFO:
break;
case LOG_INFO:
- snprintf(level_str,
15
, "[info] ");
+ snprintf(level_str,
sizeof (level_str)
, "[info] ");
break;
case LOG_DEBUG:
break;
case LOG_DEBUG:
- snprintf(level_str,
15
, "[debug] ");
+ snprintf(level_str,
sizeof (level_str)
, "[debug] ");
break;
default:
break;
break;
default:
break;
@@
-160,12
+160,9
@@
static void logfile_print (const char *msg, int severity, time_t timestamp_time)
else
{
if (print_timestamp)
else
{
if (print_timestamp)
- fprintf (fh, "[%s] %s%s\n", timestamp_str,
- print_level ? level_str : "",
- msg);
+ fprintf (fh, "[%s] %s%s\n", timestamp_str, level_str, msg);
else
else
- fprintf (fh, "%s%s\n", print_level ? level_str : "",
- msg);
+ fprintf (fh, "%s%s\n", level_str, msg);
if (do_close != 0)
fclose (fh);
if (do_close != 0)
fclose (fh);