From: Timo Kokkonen <timo.t.kokkonen@iki.fi>
Date: Sat, 9 Jul 2016 07:05:36 +0000 (+0300)
Subject: Merge branch 'master' of /home/git/rrdd
X-Git-Url: http://git.itanic.dy.fi/?p=rrdd;a=commitdiff_plain;h=aa4263883ca365033279ec10c0207cf8c729c9b7

Merge branch 'master' of /home/git/rrdd

Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>
---

aa4263883ca365033279ec10c0207cf8c729c9b7
diff --cc rrdtool.c
index be62321,909e123..c875417
--- a/rrdtool.c
+++ b/rrdtool.c
@@@ -287,15 -297,14 +287,18 @@@ static int do_rrdtool_update_data(struc
  	if (rrd->images)
  		rrdtool_draw_images(rrd->images);
  
 -	while (harvest_zombies(0));
++	if (rrd->post_draw_cmd && !strcmp(rrd->post_draw_cmd[0], "shell"))
++		run(rrd->post_draw_cmd[1], &rrd->post_draw_cmd[1]);
+ 
 -	if (rrd->post_draw_cmd && !strcmp(rrd->post_draw_cmd[0], "shell")) {
 -		pid = run(rrd->post_draw_cmd[1], &rrd->post_draw_cmd[1]);
 -		harvest_zombies(pid);
 -	}
 +	return 0;
 +}
  
 -	exit(0);
 +int rrdtool_update_data(struct rrd_database *rrd)
 +{
 +	rrd->last_update = time(0);
 +
 +	return queue_work(WORK_PRIORITY_HIGH, "rrdtool_update_data",
 +			do_rrdtool_update_data, rrd);
  }
  
  /*