Remove unecessary 2nd call of get_system_info at startup (#6128)
Chris Akritidis committed
May 27, 2019 at 10:30 UTC
9410b63ee9168c80e6b0aedd8abe4ee0944d8047
4 files changed
+7
-11
daemon/main.c
+4
-4
@@ -670,7 +670,7 @@ static int load_netdata_conf(char *filename, char overwrite_used) {
670
return ret;
671
}
672
673
-int get_system_info(RRDHOST* host, struct rrdhost_system_info *system_info) {
673
+int get_system_info(struct rrdhost_system_info *system_info) {
674
char *script;
675
script = mallocz(sizeof(char) * (strlen(netdata_configured_primary_plugins_dir) + strlen("system-info.sh") + 2));
676
sprintf(script, "%s/%s", netdata_configured_primary_plugins_dir, "system-info.sh");
@@ -701,7 +701,7 @@ int get_system_info(RRDHOST* host, struct rrdhost_system_info *system_info) {
701
char n[51], v[101];
702
snprintfz(n, 50,"%s",name);
703
snprintfz(v, 101,"%s",value);
704
- if(unlikely(rrdhost_set_system_info_variable(host, system_info, n, v))) {
704
+ if(unlikely(rrdhost_set_system_info_variable(system_info, n, v))) {
705
info("Unexpected environment variable %s=%s", n, v);
706
}
707
else {
@@ -1169,7 +1169,7 @@ int main(int argc, char **argv) {
1169
1170
netdata_anonymous_statistics_enabled=-1;
1171
struct rrdhost_system_info *system_info = calloc(1, sizeof(struct rrdhost_system_info));
1172
- get_system_info(NULL, system_info);
1172
+ get_system_info(system_info);
1173
1174
rrd_init(netdata_configured_hostname, system_info);
1175
// ------------------------------------------------------------------------
@@ -1196,7 +1196,7 @@ int main(int argc, char **argv) {
1196
info("netdata initialization completed. Enjoy real-time performance monitoring!");
1197
netdata_ready = 1;
1198
1199
- if (get_system_info(localhost, system_info) == 0) send_statistics("START","-", "-");
1199
+ send_statistics("START","-", "-");
1200
1201
// ------------------------------------------------------------------------
1202
// unblock signals
database/rrd.h
+1
-1
@@ -780,7 +780,7 @@ extern RRDHOST *rrdhost_find_or_create(
780
, struct rrdhost_system_info *system_info
781
);
782
783
-extern int rrdhost_set_system_info_variable(RRDHOST *host, struct rrdhost_system_info *system_info, char *name, char *value);
783
+extern int rrdhost_set_system_info_variable(struct rrdhost_system_info *system_info, char *name, char *value);
784
785
#if defined(NETDATA_INTERNAL_CHECKS) && defined(NETDATA_VERIFY_LOCKS)
786
extern void __rrdhost_check_wrlock(RRDHOST *host, const char *file, const char *function, const unsigned long line);
database/rrdhost.c
+1
-5
@@ -811,11 +811,9 @@ restart_after_removal:
811
// ----------------------------------------------------------------------------
812
// RRDHOST - set system info from environment variables
813
814
-int rrdhost_set_system_info_variable(RRDHOST *host, struct rrdhost_system_info *system_info, char *name, char *value) {
814
+int rrdhost_set_system_info_variable(struct rrdhost_system_info *system_info, char *name, char *value) {
815
int res = 0;
816
817
- if(host) rrdhost_wrlock(host);
818
-
817
if(!strcmp(name, "NETDATA_SYSTEM_OS_NAME")){
818
freez(system_info->os_name);
819
system_info->os_name = strdupz(value);
@@ -872,7 +870,5 @@ int rrdhost_set_system_info_variable(RRDHOST *host, struct rrdhost_system_info *
870
res = 1;
871
}
872
875
- if(host) rrdhost_unlock(host);
876
-
873
return res;
874
}
streaming/rrdpush.c
+1
-1
@@ -1178,7 +1178,7 @@ int rrdpush_receiver_thread_spawn(RRDHOST *host, struct web_client *w, char *url
1178
else if(!strcmp(name, "tags"))
1179
tags = value;
1180
else
1181
- if(unlikely(rrdhost_set_system_info_variable(NULL, system_info, name, value))) {
1181
+ if(unlikely(rrdhost_set_system_info_variable(system_info, name, value))) {
1182
info("STREAM [receive from [%s]:%s]: request has parameter '%s' = '%s', which is not used.", w->client_ip, w->client_port, key, value);
1183
}
1184
}