projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2137 from maryamtahhan/feat_ovs_stats
[collectd.git]
/
src
/
daemon
/
collectd.c
diff --git
a/src/daemon/collectd.c
b/src/daemon/collectd.c
index
60ce91f
..
6b7c413
100644
(file)
--- a/
src/daemon/collectd.c
+++ b/
src/daemon/collectd.c
@@
-92,7
+92,7
@@
static int init_hostname(void) {
int status;
str = global_option_get("Hostname");
int status;
str = global_option_get("Hostname");
- if (
str != NULL
) {
+ if (
(str != NULL) && (str[0] != 0)
) {
sstrncpy(hostname_g, str, sizeof(hostname_g));
return (0);
}
sstrncpy(hostname_g, str, sizeof(hostname_g));
return (0);
}
@@
-304,7
+304,6
@@
static int do_loop(void) {
wait_until = cdtime() + interval;
while (loop == 0) {
wait_until = cdtime() + interval;
while (loop == 0) {
- struct timespec ts_wait = {0, 0};
cdtime_t now;
#if HAVE_LIBKSTAT
cdtime_t now;
#if HAVE_LIBKSTAT
@@
-323,7
+322,7
@@
static int do_loop(void) {
continue;
}
continue;
}
-
CDTIME_T_TO_TIMESPEC(wait_until - now, &ts_wait
);
+
struct timespec ts_wait = CDTIME_T_TO_TIMESPEC(wait_until - now
);
wait_until = wait_until + interval;
while ((loop == 0) && (nanosleep(&ts_wait, &ts_wait) != 0)) {
wait_until = wait_until + interval;
while ((loop == 0) && (nanosleep(&ts_wait, &ts_wait) != 0)) {
@@
-522,7
+521,7
@@
int main(int argc, char **argv) {
*/
if (cf_read(configfile)) {
fprintf(stderr, "Error: Reading the config file failed!\n"
*/
if (cf_read(configfile)) {
fprintf(stderr, "Error: Reading the config file failed!\n"
- "Read the
syslog
for details.\n");
+ "Read the
logs
for details.\n");
return (1);
}
return (1);
}
@@
-546,7
+545,7
@@
int main(int argc, char **argv) {
* something wrong.
*/
if (init_global_variables() != 0)
* something wrong.
*/
if (init_global_variables() != 0)
-
return (1
);
+
exit(EXIT_FAILURE
);
if (test_config)
return (0);
if (test_config)
return (0);