smartware 0.4.5 → 0.4.6

data/bin/smartware

@@ -21,11 +21,11 @@ begin
 
   Smartware::Logging.logger.info "Initializing Smartware"
 
-  service.start
-
-  Smartware::Logging.logger.info "Smartware ready"
+  [ 'INT', 'TERM' ].each do |sig|
+    trap(sig) { service.stop }
+  end
 
-  service.join
+  service.start
 rescue => e
   Smartware::Logging.logger.error e.message
   Smartware::Logging.logger.error e.backtrace.join("\n")

data/bin/smartware-monitor

@@ -5,8 +5,16 @@ require 'bundler/setup'
 require 'smartware'
 
 EventMachine.run do
-  Smartware.subscribe do |key, *value|
-    puts "#{key}: #{value.map(&:inspect).join(", ")}"
+  Smartware.subscribe do |message|
+    print "#{message.key}"
+
+    if message.reliable?
+      print " (reliable, #{message.id})"
+    end
+
+    puts ": #{message.args.map(&:inspect).join(", ")}"
+
+    message.acknowlege if ARGV[0] == "ack" && message.reliable?
   end
 
   puts "Receiving Smartware events."

data/bin/smartware-ppp-helper

@@ -29,11 +29,16 @@ ensure
   io.close
 end
 
-Process.exec "/usr/sbin/pppd",
-              device, "115200",
-              "nodetach", "file", "/etc/ppp/options",
+cmdline = [
+  "/usr/sbin/pppd", device, "115200",
+  "nodetach", "logfd", "2", "file", "/etc/ppp/options"
+]
+
+cmdline.unshift "sudo" if Process.euid != 0
+
+Process.exec *cmdline,
               pgroup: true,
               in: :close,
               out: :close,
-              err: :close,
+              err: :err,
               close_others: true

data/lib/smartware.rb

@@ -8,6 +8,7 @@ require 'eventmachine'
 require 'serialport'
 require 'json'
 require 'set'
+require 'redis'
 
 require 'smartkiosk/common'
 

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

@@ -6,7 +6,38 @@ module Smartware
     module Modem
 
       class Standard
+        class LogConnection < EventMachine::Connection
+          include EventMachine::Protocols::LineProtocol
+
+          def initialize(device)
+            @device = device
+          end
+
+          def receive_line(line)
+            line.rstrip!
+
+            Logging.logger.debug "pppd: #{line}"
+
+            if line =~ /^Sent ([0-9]+) bytes, received ([0-9]+) bytes.$/
+              @sent = $1.to_i
+              @received = $2.to_i
+            elsif line =~ /^Connect time ([0-9.]+) minutes.$/
+              @time = ($1.to_f * 60).round
+            elsif line == "Connection terminated."
+              begin
+                @device.account.call @sent, @received, @time
+              ensure
+                @sent = nil
+                @received = nil
+                @time = nil
+              end
+            end
+
+          end
+        end
+
         attr_reader :error, :model, :balance, :version
+        attr_accessor :account
 
         def initialize(config)
           @port = config["port"]
@@ -29,6 +60,25 @@ module Smartware
           @balance = nil
           @ppp_state = :stopped
           @ppp_pid = nil
+          @shutdown = false
+          @account = nil
+
+          logpipe_smartware, @logpipe_ppp = IO.pipe
+          EventMachine.attach logpipe_smartware, LogConnection, self
+        end
+
+        def shutdown(callback)
+          @shutdown_callback = callback
+
+          Logging.logger.info "stopping modem gracefully"
+          @shutdown = true
+          @shutdown_timer = EventMachine.add_periodic_timer(0.5) do
+            if @state == :closed && @ppp_state == :stopped
+              Logging.logger.info "modem stopped"
+              EventMachine.cancel_timer @shutdown_timer
+              @shutdown_callback.call
+            end
+          end
         end
 
         def signal_level
@@ -43,7 +93,7 @@ module Smartware
 
             wait_for_event
           rescue => e
-            Smartware::Logging.logger.error "uncatched exception in modem monitor: #{e}"
+            Logging.logger.error "uncatched exception in modem monitor: #{e}"
           end
         end
 
@@ -56,7 +106,7 @@ module Smartware
 
         def ussd(mode, string = nil, dcs = nil)
           if mode != "0"
-            Smartware::Logging.logger.warn "USSD completed with mode #{mode}, expected 0"
+            Logging.logger.warn "USSD completed with mode #{mode}, expected 0"
           end
 
           if string
@@ -74,19 +124,21 @@ module Smartware
         def modem_tick
           case @state
           when :closed
-            Smartware::Logging.logger.info "trying to open modem"
+            if !@shutdown
+              Logging.logger.info "trying to open modem"
 
-            begin
-              @mux = CMUX::MUX.new @port
-              @state = :open
-              @status_channel = @mux.allocate(@status_channel_id).open
-              @chatter = CMUX::ModemChatter.new @status_channel
-              @chatter.subscribe "CUSD", self
-              @error = nil
-              @balance_timer = 0
-              Smartware::Logging.logger.info "modem ready"
-            rescue => e
-              close_modem "unable to open modem: #{e}"
+              begin
+                @mux = CMUX::MUX.new @port
+                @state = :open
+                @status_channel = @mux.allocate(@status_channel_id).open
+                @chatter = CMUX::ModemChatter.new @status_channel
+                @chatter.subscribe "CUSD", self
+                @error = nil
+                @balance_timer = 0
+                Logging.logger.info "modem ready"
+              rescue => e
+                close_modem "unable to open modem: #{e}"
+              end
             end
 
           when :open
@@ -110,7 +162,9 @@ module Smartware
             end
 
             if modem_works
-              if !@balance_ussd.nil? && @balance_timer == 0
+              if @shutdown && @ppp_state == :stopped
+                close_modem "service shutdown"
+              elsif !@balance_ussd.nil? && @balance_timer == 0
                 @balance_timer = @balance_interval
                 begin
                   @chatter.command("+CUSD=1,\"#{@balance_ussd}\",15", 1)
@@ -129,43 +183,45 @@ module Smartware
         def ppp_tick
           case @ppp_state
           when :stopped
-            if @state == :open
-              Smartware::Logging.logger.info "trying to start pppd"
+            if @state == :open && !@shutdown
+              Logging.logger.info "trying to start pppd"
               begin
                 @ppp_channel = @mux.allocate @ppp_channel_id
 
                 @ppp_pid = Process.spawn "smartware-ppp-helper",
                     @ppp_channel.device,
-                    @apn
+                    @apn,
+                    err: @logpipe_ppp
                 @ppp_state = :running
 
-                Smartware::Logging.logger.info "started pppd, PID #{@ppp_pid}"
-                Smartware::ProcessManager.track @ppp_pid, method(:ppp_died)
+                Logging.logger.info "started pppd, PID #{@ppp_pid}"
+                ProcessManager.track @ppp_pid, method(:ppp_died)
 
               rescue => e
-                begin
-                  @ppp_channel.close
-                rescue
-                end
+                @ppp_channel.close rescue nil
 
                 @ppp_channel = nil
                 @ppp_pid = nil
                 @ppp_state = :stopped
 
-                Smartware::Logging.logger.warn "cannot start pppd: #{e.to_s}"
+                Logging.logger.warn "cannot start pppd: #{e.to_s}"
               end
             end
 
           when :running
             if @ppp_pid.nil?
-              Smartware::Logging.logger.warn "pppd died"
-              begin
-                @ppp_channel.close
-              rescue
-              end
+              Logging.logger.warn "pppd died"
+              @ppp_channel.close rescue nil
 
               @ppp_channel = nil
               @ppp_state = :stopped
+            elsif @shutdown
+              Logging.logger.debug "Terminating pppd #{@ppp_pid}"
+              if Process.euid == 0
+                Process.kill 'TERM', @ppp_pid
+              else
+                system "sudo", "kill", "-TERM", @ppp_pid.to_s
+              end
             end
           end
         end
@@ -189,19 +245,12 @@ module Smartware
         end
 
         def close_modem(reason)
-          Smartware::Logging.logger.warn "#{reason}"
+          Logging.logger.warn "#{reason}"
 
           @error = Interface::Modem::MODEM_NOT_AVAILABLE
 
-          begin
-            @mux.close
-          rescue
-          end
-
-          begin
-            @chatter.unsubscribe "CUSD", self
-          rescue
-          end
+          @mux.close rescue nil
+          @chatter.unsubscribe "CUSD", self rescue nil
 
           @info_requested = false
           @mux = nil
@@ -209,7 +258,7 @@ module Smartware
           @status_channel = nil
           @ppp_state = :stopped
           unless @ppp_pid.nil?
-            Smartware::ProcessManager.untrack @ppp_pid
+            ProcessManager.untrack @ppp_pid
             @ppp_pid = nil # PPP will die by itself, because we closed the mux.
           end
           @state = :closed

data/lib/smartware/interfaces/interface.rb

@@ -26,6 +26,16 @@ module Smartware
                                    .new(config)
       end
 
+      def shutdown(callback)
+        if @device.respond_to? :shutdown
+          @device.shutdown callback
+
+          true
+        else
+          false
+        end
+      end
+
       def repush_events(connection)
         @status_mutex.synchronize do
           @status.each do |key, value|
@@ -64,6 +74,10 @@ module Smartware
       def publish_event(key, *data)
         @service.publish_event "#{@iface_id}.#{key}", *data
       end
+
+      def publish_reliable_event(key, *data)
+        @service.publish_reliable_event "#{@iface_id}.#{key}", *data
+      end
     end
   end
 end

data/lib/smartware/interfaces/modem.rb

@@ -6,11 +6,12 @@ module Smartware
       def initialize(config, service)
         super
 
+        @device.account = method(:account)
+
         update_status :balance, ''
         update_status :signal_level, ''
 
         @session = Thread.new &method(:poll)
-        Smartware::Logging.logger.info 'Modem monitor started'
       end
 
       def balance
@@ -39,6 +40,12 @@ module Smartware
           Smartware::Logging.logger.error e.backtrace.join("\n")
         end
       end
+
+      def account(sent, received, time)
+        Smartware::Logging.logger.debug "recording session: #{sent} upstream #{received} downstream, #{time} seconds"
+
+        publish_reliable_event 'accounting', sent, received, time
+      end
     end
   end
 end

data/lib/smartware/pub_sub_client.rb

@@ -2,6 +2,39 @@ require "em/protocols/line_protocol"
 
 module Smartware
   class PubSubClient
+    class Message
+      attr_reader :key, :args
+
+      def initialize(reliable_id, key, args, callback)
+        @reliable_id = reliable_id
+        @key = key
+        @args = args
+        @callback = callback
+      end
+
+      def reliable?
+        !@reliable_id.nil?
+      end
+
+      def id
+        @reliable_id
+      end
+
+      def acknowlege
+        raise "message is not reliable" if @reliable_id.nil?
+
+        @callback.call @reliable_id
+      end
+
+      def [](index)
+        @args[index]
+      end
+
+      def to_a
+        @args
+      end
+    end
+
     class PubSubHandler < EventMachine::Connection
       include EventMachine::Protocols::LineProtocol
 
@@ -16,7 +49,11 @@ module Smartware
       def receive_line(line)
         data = JSON.load line
 
-        @client.deliver data["key"], *data["args"]
+        @client.receive data
+      end
+
+      def send_record(data)
+        send_data(JSON.dump(data) + "\r\n")
       end
     end
 
@@ -55,8 +92,16 @@ module Smartware
       @reconnect_timer = EventMachine.add_timer 1, &method(:attempt)
     end
 
-    def deliver(key, *args)
-      @receiver.call key, *args
+    def receive(data)
+      message = Message.new data["reliable_id"],
+                            data["key"],
+                            data["args"],
+                            ->(id) do
+
+        @connection.send_record command: "acknowlege", id: id
+      end
+
+      @receiver.call message
     end
 
     private

data/lib/smartware/pub_sub_server.rb

@@ -1,6 +1,10 @@
+require "em/protocols/line_protocol"
+
 module Smartware
   class PubSubServer
     class PubSubConnection < EventMachine::Connection
+      include EventMachine::Protocols::LineProtocol
+
       def initialize(server)
         @server = server
       end
@@ -13,13 +17,30 @@ module Smartware
         @server.remove_connection self
       end
 
-      def receive_data(data)
+      def receive_line(line)
+        begin
+          data = JSON.load line
 
+          case data["command"]
+          when "acknowlege"
+            @server.acknowlege_reliable data["id"]
+
+          else
+            raise "unsupported command #{data["command"]}"
+          end
+        rescue => e
+          Logging.logger.warn e.to_s
+          e.backtrace.each { |line| Logging.logger.warn line }
+        end
       end
 
       def publish_event(key, *args)
         send_data(JSON.dump({ key: key, args: args }) + "\r\n")
       end
+
+      def publish_reliable_event(id, key, *args)
+        send_data(JSON.dump({ reliable_id: id, key: key, args: args }) + "\r\n")
+      end
     end
 
     attr_accessor :repush
@@ -27,6 +48,7 @@ module Smartware
     def initialize(host, port)
       @repush = nil
       @connections = Set.new
+      @redis = Redis.new
 
       EventMachine.start_server host, port, PubSubConnection, self
     end
@@ -34,6 +56,12 @@ module Smartware
     def add_connection(connection)
       @connections.add connection
       @repush.call connection
+
+      @redis.hgetall("smartware:reliable_events").each do |key, data|
+        data = JSON.load(data)
+
+        connection.publish_reliable_event key, data["key"], data["args"]
+      end
     end
 
     def remove_connection(connection)
@@ -45,5 +73,19 @@ module Smartware
         connection.publish_event key, *args
       end
     end
+
+    def publish_reliable_event(key, *args)
+      id = (Time.now.to_f * 1000000).round.to_s
+
+      @redis.hset "smartware:reliable_events", id, JSON.dump({ key: key, args: args })
+
+      @connections.each do |connection|
+        connection.publish_reliable_event id, key, args
+      end
+    end
+
+    def acknowlege_reliable(id)
+      @redis.hdel "smartware:reliable_events", id
+    end
   end
 end

data/lib/smartware/service.rb

@@ -6,6 +6,7 @@ module Smartware
       @config = YAML.load File.read(config_file)
       @interfaces = []
       @devices = []
+      @shutdown_holders = 0
     end
 
     def start
@@ -16,6 +17,11 @@ module Smartware
           @pubsub.publish_event key, *args
         end
 
+        @reliable_event_channel = EventMachine::Channel.new
+        @reliable_event_channel.subscribe do |(key, args)|
+          @pubsub.publish_reliable_event key, *args
+        end
+
         @pubsub = PubSubServer.new "localhost", (@config["pubsub_port"] || 6100)
         @pubsub.repush = ->(connection) do
           @devices.each do |device|
@@ -51,16 +57,30 @@ module Smartware
       @event_channel.push [key, args]
     end
 
+    def publish_reliable_event(key, *args)
+      @reliable_event_channel.push [key, args]
+    end
+
     def stop
       @interfaces.each &:stop_service
 
-      EventMachine.stop
-    end
+      callback = method :decr_shutdown_holders
 
-    def join
-      @interfaces.each do |server|
-        server.thread.join
+      @devices.each do |interface|
+        if interface.shutdown callback
+          @shutdown_holders += 1
+        end
       end
+
+      EventMachine.stop if @shutdown_holders == 0
+    end
+
+    private
+
+    def decr_shutdown_holders
+      @shutdown_holders -= 1
+
+      EventMachine.stop if @shutdown_holders == 0
     end
   end
 end

data/lib/smartware/version.rb

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

data/smartware.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'eventmachine'
   gem.add_dependency 'chunky_png'
   gem.add_dependency 'oily_png'
+  gem.add_dependency 'redis'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common
@@ -173,6 +173,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Smartware is the Smartkiosk hardware control daemon
 email:
 - e.sudarchikov@roundlake.ru