normal_worker_60sec.diff

diff --git a/lib/GrowthForecast/RRD.pm b/lib/GrowthForecast/RRD.pm
index 494b0d7..75596df 100644
--- a/lib/GrowthForecast/RRD.pm
+++ b/lib/GrowthForecast/RRD.pm
@@ -26,16 +26,18 @@ sub path_param {

     my @param = (
         '--start', $timestamp - 10, # -10 as rrdcreate's default does (now - 10s)
-        '--step', '300',
+        '--step', '60',
         "DS:num:${dst}:600:U:U",
-        'RRA:AVERAGE:0.5:1:1440',  #5分, 5日
-        'RRA:AVERAGE:0.5:6:1008', #30分, 21日
-        'RRA:AVERAGE:0.5:24:1344', #2時間, 112日
-        'RRA:AVERAGE:0.5:288:2500', #24時間, 500日
-        'RRA:MAX:0.5:1:1440',  #5分, 5日
-        'RRA:MAX:0.5:6:1008', #30分, 21日
-        'RRA:MAX:0.5:24:1344', #2時間, 112日
-        'RRA:MAX:0.5:288:2500', #24時間, 500日
+        "RRA:AVERAGE:0.5:1:4800",     #1分, 3日(80時間)
+        "RRA:AVERAGE:0.5:5:1440",     #5分, 5日
+        "RRA:AVERAGE:0.5:30:1008",    #30分, 21日
+        "RRA:AVERAGE:0.5:120:1344",   #2時間, 112日
+        "RRA:AVERAGE:0.5:1440:500",   #24時間, 500日
+        "RRA:MAX:0.5:1:4800",         #1分, 3日(80時間)
+        "RRA:MAX:0.5:5:1440",         #5分, 5日
+        "RRA:MAX:0.5:30:1008",        #30分, 21日
+        "RRA:MAX:0.5:120:1344",       #2時間, 112日
+        "RRA:MAX:0.5:1440:500",       #24時間, 500日
     );
     unless ( $self->{disable_subtract} ) {
         # --disable-subtract does not create DS:sub which results in half disksize and half rrdupdate time
@@ -231,13 +233,13 @@ sub calc_period {
         }
     }
     elsif ( $span eq 'h' || $span eq 'sh' ) {
-        $period_title = 'Hour (5min avg)';
+        $period_title = 'Hour (1min avg)';
         $period_title = 'Hour (1min avg)' if $span eq 'sh';
         $period = -1 * 60 * 60 * 2;
         $xgrid = 'MINUTE:10:MINUTE:20:MINUTE:10:0:%M';
     }
     elsif ( $span eq 'n' || $span eq 'sn' ) {
-        $period_title = 'Half Day (5min avg)';
+        $period_title = 'Half Day (1min avg)';
         $period_title = 'Half Day (1min avg)' if $span eq 'sn';
         $period = -1 * 60 * 60 * 14;
         $xgrid = 'MINUTE:60:MINUTE:120:MINUTE:120:0:%H %M';
@@ -258,25 +260,25 @@ sub calc_period {
         $xgrid = 'WEEK:1:MONTH:1:MONTH:1:2592000:%b'
     }
     elsif ( $span eq '3d' || $span eq 's3d') {
-        $period_title = '3 Days (5min avg)';
+        $period_title = '3 Days (1min avg)';
         $period_title = '3 Days (1min avg)' if $span eq 's3d';
         $period = -1 * 60 * 60 * 24 * 3;
         $xgrid = 'HOUR:6:DAY:1:HOUR:6:0:%H';
     }
     elsif ( $span eq '8h' || $span eq 's8h' ) {
-        $period_title = '8 Hours (5min avg)';
+        $period_title = '8 Hours (1min avg)';
         $period_title = '8 Hours (1min avg)' if $span eq 's8h';
         $period = -1 * 8 * 60 * 60;
         $xgrid = 'MINUTE:30:HOUR:1:HOUR:1:0:%H:%M';
     }
     elsif ( $span eq '4h' || $span eq 's4h') {
-        $period_title = '4 Hours (5min avg)';
+        $period_title = '4 Hours (1min avg)';
         $period_title = '4 Hours (1min avg)' if $span eq 's4h';
         $period = -1 * 4 * 60 * 60;
         $xgrid = 'MINUTE:30:HOUR:1:MINUTE:30:0:%H:%M';
     }
     else {
-        $period_title = 'Day (5min avg)';
+        $period_title = 'Day (1min avg)';
         $period_title = 'Day (1min avg)' if $span eq 'sd';
         $period = -1 * 60 * 60 * 33; # 33 hours
diff --git a/lib/GrowthForecast/Worker.pm b/lib/GrowthForecast/Worker.pm
index 31d9dfb..784a74e 100644
--- a/lib/GrowthForecast/Worker.pm
+++ b/lib/GrowthForecast/Worker.pm
@@ -40,7 +40,7 @@ sub rrd {
 sub run {
     my $self = shift;
     my $method = shift || 'update';
-    my $interval = ( $method eq 'update' ) ? 300 : 60;
+    my $interval = ( $method eq 'update' ) ? 60 : 60;

     local $Log::Minimal::AUTODUMP = 1;