summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorCosta Tsaousis <costa@tsaousis.gr>2018-10-26 20:34:48 +0300
committerGitHub <noreply@github.com>2018-10-26 20:34:48 +0300
commitbcdfedbe8215fdf461b61900eba2a9de4be6c0b8 (patch)
treec3597819ec055cb64bc752fe2c81fe1c485305f0 /web
parentc6cce6bd2accec27a61243e1ffa38826ac2a4892 (diff)
fixed rpm build; (#4503)
Diffstat (limited to 'web')
-rw-r--r--web/api/Makefile.am3
-rw-r--r--web/api/exporters/Makefile.am5
-rw-r--r--web/api/queries/Makefile.am2
-rw-r--r--web/api/queries/query.c3
-rw-r--r--web/server/static/static-threaded.c2
-rw-r--r--web/server/web_client.c4
6 files changed, 17 insertions, 2 deletions
diff --git a/web/api/Makefile.am b/web/api/Makefile.am
index 1b9f11ec81..b875546f98 100644
--- a/web/api/Makefile.am
+++ b/web/api/Makefile.am
@@ -3,9 +3,10 @@
AUTOMAKE_OPTIONS = subdir-objects
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-SUBDIR = \
+SUBDIRS = \
badges \
queries \
+ exporters \
$(NULL)
dist_noinst_DATA = \
diff --git a/web/api/exporters/Makefile.am b/web/api/exporters/Makefile.am
index 19554bed8e..3dce98aa94 100644
--- a/web/api/exporters/Makefile.am
+++ b/web/api/exporters/Makefile.am
@@ -3,6 +3,11 @@
AUTOMAKE_OPTIONS = subdir-objects
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+SUBDIRS = \
+ shell \
+ prometheus \
+ $(NULL)
+
dist_noinst_DATA = \
README.md \
$(NULL)
diff --git a/web/api/queries/Makefile.am b/web/api/queries/Makefile.am
index 158ef27aeb..008dbfeb8b 100644
--- a/web/api/queries/Makefile.am
+++ b/web/api/queries/Makefile.am
@@ -5,11 +5,13 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
SUBDIRS = \
average \
+ des \
incremental_sum \
max \
min \
sum \
median \
+ ses \
stddev \
$(NULL)
diff --git a/web/api/queries/query.c b/web/api/queries/query.c
index 87e8de09ed..7b02e8f2b3 100644
--- a/web/api/queries/query.c
+++ b/web/api/queries/query.c
@@ -504,7 +504,7 @@ static inline void do_dimension(
// ----------------------------------------------------------------------------
// fill RRDR for the whole chart
-
+#ifdef NETDATA_INTERNAL_CHECKS
static void rrd2rrdr_log_request_response_metdata(RRDR *r
, RRDR_GROUPING group_method
, int aligned
@@ -571,6 +571,7 @@ static void rrd2rrdr_log_request_response_metdata(RRDR *r
, msg
);
}
+#endif // NETDATA_INTERNAL_CHECKS
RRDR *rrd2rrdr(
RRDSET *st
diff --git a/web/server/static/static-threaded.c b/web/server/static/static-threaded.c
index a037390b8a..56b8dbf8dd 100644
--- a/web/server/static/static-threaded.c
+++ b/web/server/static/static-threaded.c
@@ -164,6 +164,8 @@ static void web_server_del_callback(POLLINFO *pi) {
w->pollinfo_slot = 0;
if(unlikely(w->pollinfo_filecopy_slot)) {
POLLINFO *fpi = pollinfo_from_slot(pi->p, w->pollinfo_filecopy_slot); // POLLINFO of the client socket
+ (void)fpi;
+
debug(D_WEB_CLIENT, "%llu: THE CLIENT WILL BE FRED BY READING FILE JOB ON FD %d", w->id, fpi->fd);
}
else {
diff --git a/web/server/web_client.c b/web/server/web_client.c
index cce995b78f..282cfcd1a1 100644
--- a/web/server/web_client.c
+++ b/web/server/web_client.c
@@ -1593,6 +1593,8 @@ ssize_t web_client_read_file(struct web_client *w)
ssize_t bytes = read(w->ifd, &w->response.data->buffer[w->response.data->len], (size_t)left);
if(likely(bytes > 0)) {
size_t old = w->response.data->len;
+ (void)old;
+
w->response.data->len += bytes;
w->response.data->buffer[w->response.data->len] = '\0';
@@ -1646,6 +1648,8 @@ ssize_t web_client_receive(struct web_client *w)
w->stats_received_bytes += bytes;
size_t old = w->response.data->len;
+ (void)old;
+
w->response.data->len += bytes;
w->response.data->buffer[w->response.data->len] = '\0';