Changeset 3414

Show
Ignore:
Timestamp:
03/13/10 11:08:38 (5 months ago)
Author:
steve.schnepp
Message:

- re-enabling the mtime setting of the generated png file to the mtime of the rrd file. But only for --nolazy, since it breaks --lazy.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/master/lib/Munin/Master/GraphOld.pm

    r3412 r3414  
    11641164        (my $picdirname = $picfilename) =~ s/\/[^\/]+$//; 
    11651165 
    1166         # DEBUG "[DEBUG] Picture filename: $picfilename"; 
     1166        DEBUG "[DEBUG] Picture filename: $picfilename"; 
    11671167 
    11681168        my @complete = get_fonts(); 
    …… 
    12521252 
    12531253            # Since this disrupts rrd's --lazy option we're disableing 
    1254             # it until we can do it in a less distructive way, we need 
    1255             # to do it only on files that were updated _just_ now. 
    1256             # Should probably also only be done in cgi mode. 
    1257  
    1258             # utime $lastupdate, $lastupdate, 
    1259             # et_picture_filename($service, $time); 
     1254            # it unless we were specially asked --nolazy. 
     1255            # This way --lazy continues to work as expected, and since 
     1256            # CGI uses --nolazy, http IMS are working also as expected. 
     1257            if (! $force_lazy) { 
     1258                DEBUG "[DEBUG] setting time on $picfilename"; 
     1259                utime $lastupdate, $lastupdate, $picfilename; 
     1260            } 
    12601261 
    12611262            if ($list_images) { 
    12621263                # Command-line option to list images created 
    1263                 print get_picture_filename ($service, $time), "\n"; 
     1264                print $picfilename. "\n"; 
    12641265            } 
    12651266        }