smartware 0.4.6 → 0.4.7

data/lib/smartware/drivers/modem/standard.rb

@@ -18,15 +18,22 @@ module Smartware
 
             Logging.logger.debug "pppd: #{line}"
 
-            if line =~ /^Sent ([0-9]+) bytes, received ([0-9]+) bytes.$/
+            case line
+            when /authentication succeeded$/
+              @started = Time.now.to_i
+
+            when /^Sent ([0-9]+) bytes, received ([0-9]+) bytes.$/
               @sent = $1.to_i
               @received = $2.to_i
-            elsif line =~ /^Connect time ([0-9.]+) minutes.$/
+
+            when /^Connect time ([0-9.]+) minutes.$/
               @time = ($1.to_f * 60).round
-            elsif line == "Connection terminated."
+
+            when "Connection terminated."
               begin
-                @device.account.call @sent, @received, @time
+                @device.account.call @started, @sent, @received, @time
               ensure
+                @started = nil
                 @sent = nil
                 @received = nil
                 @time = nil

data/lib/smartware/interfaces/modem.rb

@@ -41,10 +41,10 @@ module Smartware
         end
       end
 
-      def account(sent, received, time)
+      def account(started, sent, received, time)
         Smartware::Logging.logger.debug "recording session: #{sent} upstream #{received} downstream, #{time} seconds"
 
-        publish_reliable_event 'accounting', sent, received, time
+        publish_reliable_event 'accounting', started, sent, received, time
       end
     end
   end

data/lib/smartware/version.rb

@@ -1,3 +1,3 @@
 module Smartware
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors: