Merge branch 'master' of https://github.com/TACC/tacc_stats

rtevans · rtevans · commit 0216d5a87bfe · 2018-02-08T09:58:25.000-06:00
was necessary
diff --git a/monitor/src/stats_buffer.c b/monitor/src/stats_buffer.c
@@ -43,10 +43,12 @@ static int send(struct stats_buffer *sf)
 
   if (!socket) {
     ERROR("socket failed to initialize");
+    return -1;	
   }
   status = amqp_socket_open(socket, sf->sf_host, atoi(sf->sf_port));
   if (status) {
     ERROR("socket failed to open");
+    return -1;	  
   }
 
   amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, 

Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,12 @@ static int send(struct stats_buffer *sf)`
`43`	`43`
`44`	`44`	`if (!socket) {`
`45`	`45`	`ERROR("socket failed to initialize");`
	`46`	`+ return -1;`
`46`	`47`	`}`
`47`	`48`	`status = amqp_socket_open(socket, sf->sf_host, atoi(sf->sf_port));`
`48`	`49`	`if (status) {`
`49`	`50`	`ERROR("socket failed to open");`
	`51`	`+ return -1;`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN,`