gt06_server 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6badba6dc484656af3c748b440f056939d3c805
-  data.tar.gz: db9fc1cc01be0b01f459f79dcd1e454ae12f8ba3
+  metadata.gz: e529d1799f33d8ba12e1236e6811dd265f12196f
+  data.tar.gz: 4c78509f1ef0311d99d69c8b52f0592538c269cd
 SHA512:
-  metadata.gz: 7d0448a5b3a64627a81d6944afef86858be10818b935513d6754749f7d99b0fd347ac64ede06af5264fbfd140146305f0a3cf3cee1ab173aec841a4ad0a8ca60
-  data.tar.gz: 9a4dd20d39938f850ac5876d424b583f88a773a5997608cfc7d003d5c2d533bab69dd65fb98644b3fe4d171f42ac3f20621e456b84ff4b9a9dffd7e4ff6b809a
+  metadata.gz: bccdc6654fb193367a58f5ae6608355034168dc316cf3f743c7370dcedec8a01e292654d7ed4716d3abd2503a74d72a2026744d82e5c0013581a13f40663b0bc
+  data.tar.gz: 8c501ab625004291b3998a301863ec329a03c3d730132abc9db31e90e8fb50a8efe58edd3d8023e71aee810490eb98f29f4d3deeb94aac62dcc83dc2db08872e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gt06_server (0.0.1)
+    gt06_server (0.0.2)
       bindata (~> 2.3)
       celluloid-io (~> 0.17.3)
       concurrent-ruby (~> 1.0)
@@ -16,7 +16,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bindata (2.3.1)
+    bindata (2.3.4)
     byebug (9.0.5)
     capistrano (3.5.0)
       airbrussh (>= 1.0.0)
@@ -148,4 +148,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.13.1
+   1.13.6

data/lib/gt06_server/packet.rb

@@ -13,18 +13,20 @@ require_relative 'messages/gps_query_address'
 module Gt06Server
   class TerminalPacket < BinData::Record
     class << self
-      attr_accessor :types
-    end
+      attr_reader :types
 
-    TerminalPacket.types = {
-      login_message:                 0x01,
-      location_data:                 0x12,
-      status_information:            0x13,
-      string_information:            0x15,
-      alarm_packet:                  0x16,
-      gps_query_address_information: 0x1A,
-      command_information:           0x80
-    }
+      def types
+        {
+            login_message:                 0x01,
+            location_data:                 0x12,
+            status_information:            0x13,
+            string_information:            0x15,
+            alarm_packet:                  0x16,
+            gps_query_address_information: 0x1A,
+            command_information:           0x80
+        }
+      end
+    end
 
     # Data Packet Format
     # The communication is transferred asynchronously in bytes.

data/lib/gt06_server/server.rb

@@ -32,18 +32,20 @@ module Gt06Server
     end
 
     def initialize(host, port, handler, options: {} )
-
       @logger = options.fetch(:logger, Logger.new(STDOUT))
       @host   = host
       @port   = port
 
       @sessions = Concurrent::Map.new
 
-      sweeper = SessionSweeper.new(@sessions, options.fetch(:session_timeout, nil), interval: options.fetch(:sweep_interval, nil))
+      sweeper = SessionSweeper.new(
+          @sessions,
+          options.fetch(:session_timeout, nil),
+          interval: options.fetch(:sweep_interval, nil),
+          logger: @logger
+      )
       sweeper.run
 
-      @info = { sweeper_info: sweeper.info }
-
       async.run handler
     end
 

data/lib/gt06_server/session.rb

@@ -3,10 +3,11 @@ module Gt06Server
   class Session
     class SessionError < RuntimeError; end
 
-    attr_reader :terminal_id, :io, :info, :logger
+    attr_reader :terminal_id, :io, :info, :logger, :addr
 
     def initialize(io, logger: Logger.new(STDOUT))
       @io          = io
+      @addr        = io.peeraddr
       @terminal_id = ''
       @info        = { received_count: 0, sent_count: 0, last_received_at: Time.now}
       @logger      = logger
@@ -24,6 +25,10 @@ module Gt06Server
       end
     end
 
+    def inspect
+      "#{object_id} Terminal id:#{@terminal_id}, ip: #{@addr}, #{@info}"
+    end
+
     private
 
     def handle_head_pack(pack)

data/lib/gt06_server/session_sweeper.rb

@@ -1,13 +1,14 @@
 require 'concurrent'
 
 class SessionSweeper
-  attr_reader :sessions , :info, :timeout, :interval
+  attr_reader :sessions , :info, :timeout, :interval, :logger
 
-  def initialize(sessions, timeout = 60, interval: 30)
+  def initialize(sessions, timeout = 60, interval: 30, logger: Logger.new(STDOUT))
     @sessions = sessions
     @timeout  = timeout
     @interval = interval
     @info     = {killed: 0, live:0, count:0}
+    @logger   = logger
   end
 
   def run
@@ -17,7 +18,9 @@ class SessionSweeper
         if (session.info[:last_received_at] + @timeout) < time_now
           session.io.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, [1,0].pack('ii'))
           session.io.close
-          puts "Session #{session} has been closed"
+
+          @logger.debug "Session #{session.inspect} has been closed"
+
           @info[:killed] += 1
           @sessions.delete(key)
         end
@@ -25,9 +28,27 @@ class SessionSweeper
 
       @info[:live] = @sessions.size
       @info[:count] += 1
+
+      @info
     end
 
+    timer.add_observer(SessionSweeperObserver.new(@logger))
     timer.execute
   end
 
+  class SessionSweeperObserver
+    def initialize(logger)
+      @logger = logger
+    end
+
+    def update(time, result, exception)
+      if result
+        @logger.info "(#{time}) Execution successfully returned #{result}"
+      else
+        @logger.error "(#{time}) Execution failed with error #{exception}"
+        # Airbrake.notify(exception)
+      end
+    end
+  end
+
 end

data/lib/gt06_server/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Gt06Server
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gt06_server
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - CoolElvis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-13 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata