Merge lp:~jbernard/byobu/uptime-since-instance-creation into lp:byobu

[Jon Bernard]

This branch changes ec2_cost and rcs_cost to calculate uptime since instance creation, rather than the last reboot. This is calculated by subtracting the ctime of /etc/crontab from the current time, and using that in subsequent calculations.

=== modified file 'usr/lib/byobu/ec2_cost'
--- usr/lib/byobu/ec2_cost	2010-05-15 19:38:08 +0000
+++ usr/lib/byobu/ec2_cost	2010-05-21 14:07:25 +0000
@@ -71,9 +71,7 @@
 network_cost=`echo "$tx_gb" "$TX_RATE" "$rx_gb" "$RX_RATE" | awk '{printf "%f %f", $1*$2, $3*$4}' | awk '{printf "%f", $1 + $2}'`
 
 # Calculate uptime cost
-# BUG: This will only calculate uptime since boot!
-#      Some additional input will be required to account for reboots!!!
-hours=`awk '{printf "%f", 1 + $1 / 60 / 60 }' /proc/uptime | sed 's/\..*$//' `
+hours=$(((`date +%s` - `stat --printf %Z /etc/crontab`) / 60 / 60))
 uptime_cost=`echo "$hours" | awk "{printf \"%f\", "$RATE" * $hours}"`
 total_cost=`echo "$network_cost" "$uptime_cost" | awk '{printf "%.2f", $1 + $2}'`
 

=== modified file 'usr/lib/byobu/rcs_cost'
--- usr/lib/byobu/rcs_cost	2010-05-15 19:38:08 +0000
+++ usr/lib/byobu/rcs_cost	2010-05-21 14:07:25 +0000
@@ -74,9 +74,7 @@
 network_cost=`echo "$tx_gb" "$TX_RATE" "$rx_gb" "$RX_RATE" | awk '{printf "%f %f", $1*$2, $3*$4}' | awk '{printf "%f", $1 + $2}'`
 
 # Calculate uptime cost
-# BUG: This will only calculate uptime since boot!
-#      Some additional input will be required to account for reboots!!!
-hours=`awk '{printf "%f", 1 + $1 / 60 / 60 }' /proc/uptime | sed 's/\..*$//' `
+hours=$(((`date +%s` - `stat --printf %Z /etc/crontab`) / 60 / 60))
 uptime_cost=`echo "$hours" | awk "{printf \"%f\", "$MEMORY_RATE" * $hours}"`
 total_cost=`echo "$network_cost" "$uptime_cost" | awk '{printf "%.2f", $1 + $2}'`