smartkiosk-client 0.1.14 → 0.1.15

data/app/controllers/session_records.rb

@@ -0,0 +1,7 @@
+class Application
+  get '/session_records' do
+    json SessionRecord.recent.as_json(
+      :only => [ :started_at, :upstream, :downstream, :time ]
+    )
+  end
+end

data/app/models/session_record.rb

@@ -1,3 +1,5 @@
 class SessionRecord < ActiveRecord::Base
-
+  scope :recent, where(
+    arel_table[:created_at].gt(Date.today-1.month)
+  ).order(arel_table[:id].desc)
 end

data/app/workers/ping_worker.rb

@@ -5,7 +5,6 @@ class PingWorker
 
   sidekiq_options :retry => false, :queue => :pings
 
-  DAY = 24 * 3600
   SEMAPHORE = ConnectionPool.new(:size => 1, :timeout => 5) { true }
 
   def perform
@@ -15,34 +14,6 @@ class PingWorker
 
         Sidekiq::Logging.logger.info "Requesting with updated_at: #{Terminal.providers_updated_at}"
 
-        sessions_per_day = {}
-        sessions = SessionRecord.all
-
-        sessions.each do |session|
-          next if session.time == 0
-
-          session_start = session.started_at
-          session_start -= session_start % DAY
-          session_end = session.started_at + session.time
-
-          session_start.step(session_end - 1, DAY) do |day|
-            day_time = [ day + DAY - 1, session.started_at + session.time ].min -
-                       [ day, session.started_at ].max
-
-            fraction = day_time / session.time
-
-            sessions_per_day[day] = {
-              upstream:   session.upstream * fraction,
-              downstream: session.downstream * fraction,
-              time:       session.time * fraction
-            }
-          end
-        end
-
-        sessions.each do |day, charges|
-          Sidekiq::Logging.logger.info "reporting #{charges.inspect} on #{day}"
-        end
-
         begin
           response = RestClient::Request.execute(
             :method       => :post,
@@ -55,8 +26,7 @@ class PingWorker
             },
             :payload => JSON.dump(
               :terminal => Terminal.keyword,
-              :terminal_ping => condition,
-              :sessions => sessions_per_day
+              :terminal_ping => condition
             )
           )
         rescue Exception => e
@@ -73,10 +43,6 @@ class PingWorker
 
         Sidekiq::Logging.logger.info "Response: #{response.inspect}"
 
-        ActiveRecord::Base.transaction do
-          sessions.each &:destroy
-        end
-
         #
         # PROFILE
         #
@@ -110,6 +76,12 @@ class PingWorker
         end
 
         Sync::ProvidersWorker.perform_async if response[:update_providers]
+
+        #
+        # SESSIONS
+        #
+        last_session = response[:last_session_started_at] || 0
+        Sync::SessionsWorker.perform_async(last_session )if SessionRecord.exists?([ 'started_at > ?', last_session ])
       end
     rescue Timeout::Error => e
       Sidekiq::Logging.logger.warn "Semaphore timeout. #{e.to_s}"

data/app/workers/sync/sessions_worker.rb

@@ -0,0 +1,37 @@
+require 'rest-client'
+
+module Sync
+  class SessionsWorker
+    include Sidekiq::Worker
+
+    sidekiq_options :retry => false, :queue => :sync
+
+    def perform(from_time)
+      sessions = SessionRecord.where("started_at > ?", from_time).order("started_at").all
+
+      sessions.each do |session|
+        Sidekiq::Logging.logger.info "- submitting session #{session.message_id}"
+
+        providers = RestClient::Request.execute(
+          :method       => :post,
+          :url          => "#{Terminal.config.host}/session_records",
+          :timeout      => 40,
+          :open_timeout => 60,
+          :payload => {
+            :terminal => Terminal.keyword,
+            :session_record => {
+              :message_id => session.message_id,
+              :started_at => session.started_at,
+              :upstream   => session.upstream,
+              :downstream => session.downstream,
+              :time       => session.time
+            }
+          }
+        )
+      end
+
+    rescue Exception => e
+      Sidekiq::Logging.logger.warn e.to_s
+    end
+  end
+end

data/bin/smartkiosk-client

@@ -46,12 +46,16 @@ EventMachine.run do
     if message.key == "modem.accounting"
       message.acknowlege
 
-      p message
-
-      SessionRecord.create(started_at: message[0],
-                           upstream: message[1],
-                           downstream: message[2],
-                           time: message[3])
+      begin
+        SessionRecord.create(message_id: message.id,
+                             started_at: message[0],
+                             upstream: message[1],
+                             downstream: message[2],
+                             time: message[3])
+      rescue => e
+        Smartkiosk::Client::Logging.logger.error "unable to save session record: #{e}"
+        e.backtrace.each { |line| Smartkiosk::Client::Logging.logger.error line }
+      end
     else
       @front_orders.push ["smartware.#{message.key}", message.args].to_json
     end

data/db/migrate/20130216114539_create_session_records.rb

@@ -1,6 +1,7 @@
 class CreateSessionRecords < ActiveRecord::Migration
   def change
     create_table :session_records do |t|
+      t.string  :message_id
       t.integer :started_at
       t.integer :upstream
       t.integer :downstream
@@ -8,5 +9,7 @@ class CreateSessionRecords < ActiveRecord::Migration
 
       t.timestamps
     end
+
+    add_index :session_records, [ :message_id ], :unique => true
   end
 end

data/lib/smartkiosk/client/version.rb

@@ -2,6 +2,6 @@ require 'sinatra/base'
 
 module Smartkiosk
   class Client < Sinatra::Base
-    VERSION = '0.1.14'
+    VERSION = '0.1.15'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-client
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -541,6 +541,7 @@ files:
 - app/controllers/config.rb
 - app/controllers/payments.rb
 - app/controllers/receipts.rb
+- app/controllers/session_records.rb
 - app/controllers/terminal.rb
 - app/models/admin.rb
 - app/models/banner.rb
@@ -574,6 +575,7 @@ files:
 - app/workers/sync/logo_worker.rb
 - app/workers/sync/providers_worker.rb
 - app/workers/sync/receipt_templates_worker.rb
+- app/workers/sync/sessions_worker.rb
 - bin/smartkiosk-client
 - config/boot.rb
 - config/services/application.yml
@@ -627,7 +629,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -856372630699196586
+      hash: -3441276206886059844
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -636,10 +638,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -856372630699196586
+      hash: -3441276206886059844
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Smartkiosk client application