copy is not atomic...

diff --git a/upsgraph.pl b/upsgraph.pl
index 04a4f8c751bc15f8747374ed48f40a86bf337b02..e846a23b42eeecca4219fbcc561ea5ed9e225207 100755 (executable)
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -326,13 +326,14 @@ while(1) {
                foreach my $var (@{$host->{'fields'}}) {
                        my @graphdef = ("--lazy", "-t", $hostname." - ".$vars->{$var}->{'name'}, "DEF:${var}=${rrdfile}.${var}:${var}:AVERAGE", "LINE1:${var}#FF0000");
                        (my $averages, my $width, my $height) =
-                               RRDs::graph("${outdir}/${hostname}.${var}.png.new",
+                               RRDs::graph("${outdir}/${hostname}.${var}.png.work",
                                                "-w", "720", @graphdef);
 
                        if (RRDs::error) {
                                print "Error while graphing: " . RRDs::error . "\n";
                        } else {
-                               copy("${outdir}/${hostname}.${var}.png.new", "${outdir}/${hostname}.${var}.png");
+                               copy("${outdir}/${hostname}.${var}.png.work", "${outdir}/${hostname}.${var}.png.new");
+                               rename("${outdir}/${hostname}.${var}.png.new", "${outdir}/${hostname}.${var}.png");
                        }
 
                        print HTML "<a href=\"${hostname}.${var}.html\"><img src=\"${hostname}.${var}.png\" width=\"${width}\" height=\"${height}\" border=\"0\"></a><br>\n";
@@ -355,37 +356,40 @@ while(1) {
                        push @graphdef, "GPRINT:cur:Current\\: %.2lf";
 
                        ($averages, $width, $height) =
-                               RRDs::graph("${outdir}/${hostname}.${var}.long.png.new",
+                               RRDs::graph("${outdir}/${hostname}.${var}.long.png.work",
                                                "-w", "1008", @graphdef);
 
                        if (RRDs::error) {
                                print "Error while graphing: " . RRDs::error . "\n";
                        } else {
-                               copy("${outdir}/${hostname}.${var}.long.png.new", "${outdir}/${hostname}.${var}.long.png");
+                               copy("${outdir}/${hostname}.${var}.long.png.work", "${outdir}/${hostname}.${var}.long.png.new");
+                               rename("${outdir}/${hostname}.${var}.long.png.new", "${outdir}/${hostname}.${var}.long.png");
                        }
 
                        print HTML2 "<img src=\"${hostname}.${var}.long.png\" width=\"${width}\" height=\"${height}\"><br>";
 
                        ($averages, $width, $height) =
-                               RRDs::graph("${outdir}/${hostname}.${var}.week.png.new",
+                               RRDs::graph("${outdir}/${hostname}.${var}.week.png.work",
                                                "-w", "1008", "-e", "now", "-s", "end-1w", @graphdef);
 
                        if (RRDs::error) {
                                print "Error while graphing: " . RRDs::error . "\n";
                        } else {
-                               copy("${outdir}/${hostname}.${var}.week.png.new", "${outdir}/${hostname}.${var}.week.png");
+                               copy("${outdir}/${hostname}.${var}.week.png.work", "${outdir}/${hostname}.${var}.week.png.new");
+                               rename("${outdir}/${hostname}.${var}.week.png.new", "${outdir}/${hostname}.${var}.week.png");
                        }
 
                        print HTML2 "<img src=\"${hostname}.${var}.week.png\" width=\"${width}\" height=\"${height}\"><br>";
 
                        ($averages, $width, $height) =
-                               RRDs::graph("${outdir}/${hostname}.${var}.year.png.new",
+                               RRDs::graph("${outdir}/${hostname}.${var}.year.png.work",
                                                "-w", "1008", "-e", "now", "-s", "end-1y", @graphdef);
 
                        if (RRDs::error) {
                                print "Error while graphing: " . RRDs::error . "\n";
                        } else {
-                               copy("${outdir}/${hostname}.${var}.year.png.new", "${outdir}/${hostname}.${var}.year.png");
+                               copy("${outdir}/${hostname}.${var}.year.png.work", "${outdir}/${hostname}.${var}.year.png.new");
+                               rename("${outdir}/${hostname}.${var}.year.png.new", "${outdir}/${hostname}.${var}.year.png");
                        }
 
                        print HTML2 "<img src=\"${hostname}.${var}.year.png\" width=\"${width}\" height=\"${height}\"><br>";