projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pull/collectd-4.0' into collectd-4.0
[collectd.git]
/
src
/
csv.c
diff --git
a/src/csv.c
b/src/csv.c
index
f4b56fe
..
192cf52
100644
(file)
--- a/
src/csv.c
+++ b/
src/csv.c
@@
-22,7
+22,6
@@
#include "collectd.h"
#include "plugin.h"
#include "common.h"
#include "collectd.h"
#include "plugin.h"
#include "common.h"
-#include "utils_debug.h"
/*
* Private variables
/*
* Private variables
@@
-42,7
+41,7
@@
static int value_list_to_string (char *buffer, int buffer_len,
int status;
int i;
int status;
int i;
- memset (buffer, '\0',
sizeof (buffer_len)
);
+ memset (buffer, '\0',
buffer_len
);
status = snprintf (buffer, buffer_len, "%u", (unsigned int) vl->time);
if ((status < 1) || (status >= buffer_len))
status = snprintf (buffer, buffer_len, "%u", (unsigned int) vl->time);
if ((status < 1) || (status >= buffer_len))
@@
-121,7
+120,7
@@
static int value_list_to_filename (char *buffer, int buffer_len,
now = time (NULL);
if (localtime_r (&now, &stm) == NULL)
{
now = time (NULL);
if (localtime_r (&now, &stm) == NULL)
{
-
syslog (LOG_ERR,
"csv plugin: localtime_r failed");
+
ERROR (
"csv plugin: localtime_r failed");
return (1);
}
return (1);
}
@@
-143,8
+142,10
@@
static int csv_create_file (const char *filename, const data_set_t *ds)
csv = fopen (filename, "w");
if (csv == NULL)
{
csv = fopen (filename, "w");
if (csv == NULL)
{
- syslog (LOG_ERR, "csv plugin: fopen (%s) failed: %s",
- filename, strerror(errno));
+ char errbuf[1024];
+ ERROR ("csv plugin: fopen (%s) failed: %s",
+ filename,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (-1);
}
return (-1);
}
@@
-200,7
+201,7
@@
static int csv_write (const data_set_t *ds, const value_list_t *vl)
if (value_list_to_filename (filename, sizeof (filename), ds, vl) != 0)
return (-1);
if (value_list_to_filename (filename, sizeof (filename), ds, vl) != 0)
return (-1);
- D
BG ("
filename = %s;", filename);
+ D
EBUG ("csv plugin: csv_write:
filename = %s;", filename);
if (value_list_to_string (values, sizeof (values), ds, vl) != 0)
return (-1);
if (value_list_to_string (values, sizeof (values), ds, vl) != 0)
return (-1);
@@
-214,14
+215,16
@@
static int csv_write (const data_set_t *ds, const value_list_t *vl)
}
else
{
}
else
{
- syslog (LOG_ERR, "stat(%s) failed: %s",
- filename, strerror (errno));
+ char errbuf[1024];
+ ERROR ("stat(%s) failed: %s", filename,
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
}
else if (!S_ISREG (statbuf.st_mode))
{
return (-1);
}
}
else if (!S_ISREG (statbuf.st_mode))
{
-
syslog (LOG_ERR,
"stat(%s): Not a regular file!",
+
ERROR (
"stat(%s): Not a regular file!",
filename);
return (-1);
}
filename);
return (-1);
}
@@
-229,8
+232,9
@@
static int csv_write (const data_set_t *ds, const value_list_t *vl)
csv = fopen (filename, "a");
if (csv == NULL)
{
csv = fopen (filename, "a");
if (csv == NULL)
{
- syslog (LOG_ERR, "csv plugin: fopen (%s) failed: %s",
- filename, strerror (errno));
+ char errbuf[1024];
+ ERROR ("csv plugin: fopen (%s) failed: %s", filename,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (-1);
}
csv_fd = fileno (csv);
return (-1);
}
csv_fd = fileno (csv);
@@
-245,8
+249,9
@@
static int csv_write (const data_set_t *ds, const value_list_t *vl)
status = fcntl (csv_fd, F_SETLK, &fl);
if (status != 0)
{
status = fcntl (csv_fd, F_SETLK, &fl);
if (status != 0)
{
- syslog (LOG_ERR, "csv plugin: flock (%s) failed: %s",
- filename, strerror (errno));
+ char errbuf[1024];
+ ERROR ("csv plugin: flock (%s) failed: %s", filename,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
fclose (csv);
return (-1);
}
fclose (csv);
return (-1);
}
@@
-265,4
+270,4
@@
void module_register (void)
plugin_register_config ("csv", csv_config,
config_keys, config_keys_num);
plugin_register_write ("csv", csv_write);
plugin_register_config ("csv", csv_config,
config_keys, config_keys_num);
plugin_register_write ("csv", csv_write);
-}
+}
/* void module_register */