Merge pull request #1403 from ktsaou/master

allow dashboards to retry fetching chart data on failures

diff --git a/src/freebsd_sysctl.c b/src/freebsd_sysctl.c
index d4786531f376109b32a0b56d6887f7d0da83613e..da85b838331a862aaca5a4ffbb614d9b796e6940 100644 (file)
--- a/src/freebsd_sysctl.c
+++ b/src/freebsd_sysctl.c
@@ -15,6 +15,7 @@
 // NEEDED BY: struct sysctl_netisr_workstream, struct sysctl_netisr_work
 #include <net/netisr.h>
 // NEEDED BY: struct ifaddrs, getifaddrs()
+#define _IFI_OQDROPS // It is for FreeNAS only. Most probably in future releases of FreeNAS it will be removed
 #include <net/if.h>
 #include <ifaddrs.h>
 // NEEDED BY: do_disk_io

diff --git a/src/rrd.c b/src/rrd.c
index 40bf08aabc524250d06a0fcdb577127edef3088e..72b264affa86ae7195c6c426b1b9653c56ca99d4 100644 (file)
--- a/src/rrd.c
+++ b/src/rrd.c
@@ -1093,7 +1093,7 @@ usec_t rrdset_done(RRDSET *st)
 
     // check if the chart has a long time to be updated
     if(unlikely(st->usec_since_last_update > st->entries * update_every_ut)) {
-        info("%s: took too long to be updated (%0.3Lf secs). Reseting it.", st->name, (long double)(st->usec_since_last_update / 1000000.0));
+        info("%s: took too long to be updated (%0.3Lf secs). Resetting it.", st->name, (long double)(st->usec_since_last_update / 1000000.0));
         rrdset_reset(st);
         st->usec_since_last_update = update_every_ut;
         first_entry = 1;
@@ -1142,7 +1142,7 @@ usec_t rrdset_done(RRDSET *st)
 
     // check if we will re-write the entire data set
     if(unlikely(dt_usec(&st->last_collected_time, &st->last_updated) > st->entries * update_every_ut)) {
-        info("%s: too old data (last updated at %ld.%ld, last collected at %ld.%ld). Reseting it. Will not store the next entry.", st->name, st->last_updated.tv_sec, st->last_updated.tv_usec, st->last_collected_time.tv_sec, st->last_collected_time.tv_usec);
+        info("%s: too old data (last updated at %ld.%ld, last collected at %ld.%ld). Resetting it. Will not store the next entry.", st->name, st->last_updated.tv_sec, st->last_updated.tv_usec, st->last_collected_time.tv_sec, st->last_collected_time.tv_usec);
         rrdset_reset(st);
 
         st->usec_since_last_update = update_every_ut;

diff --git a/src/web_client.c b/src/web_client.c
index 50779b54af6dbb208bd70d8bd8a3b582d5f1333f..2d2e84f93c67b80e5063a86e7fa881a6adeb5acf 100644 (file)
--- a/src/web_client.c
+++ b/src/web_client.c
@@ -121,7 +121,7 @@ struct web_client *web_client_create(int listener)
 void web_client_reset(struct web_client *w) {
     web_client_uncrock_socket(w);
 
-    debug(D_WEB_CLIENT, "%llu: Reseting client.", w->id);
+    debug(D_WEB_CLIENT, "%llu: Resetting client.", w->id);
 
     if(likely(w->last_url[0])) {
         struct timeval tv;