carnivore-unixsocket 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0690f9cf11c543bfc6f51202a972f3b6852228b
-  data.tar.gz: 0b450308e838d001f603b90ea15f1b491a6b1506
+  metadata.gz: ac593dce0b201d4ef9408cdf9ae84a1384a974c3
+  data.tar.gz: b739dd496994e3877119dbe855ac662b85b65071
 SHA512:
-  metadata.gz: 504228019293064bd168444a5018c73c09efd6e8077c1b438eac9bb30c479095f2949bf36a609d4d904dd5067c2e32503e1b1e06cad7289a0aecffc7ae1bc53d
-  data.tar.gz: 4559e2340b4861cb4e133dc880857241eb61b038bd7603c86a1af7ea0f5331e686414a23bb6746fbf57700ed386bd5b152888f2e7ff5dc7b3c63a1296cd4cff0
+  metadata.gz: 75adbc8989a62869040b2f488cda19013d5102088a5190e4dc0464d4835c00c9195ce68778e1957a74db2312408eacca1958a04a3e866814fe3ec5caa1fbd2e0
+  data.tar.gz: bbf897e05ba4e2ffa71563c3e663e453f061f0f4b1dbeaf5d99d3219bdd56b6292bc238acff7cce1269862834bf4f5fc6cb810359c3d4876ab47bc6735424df7

data/CHANGELOG.md

@@ -1,2 +1,5 @@
+# v0.2.0
+* Remove celluloid dependency
+
 # v0.1.0
 * Initial release

data/README.md

@@ -10,7 +10,7 @@ require 'carnivore-unixsocket'
 
 Carnivore.configure do
   source = Carnivore::Source.build(
-    :type => :socket, :args => {:path => '/var/run/my.sock'}
+    :type => :unix_socket, :args => {:path => '/var/run/my.sock'}
   )
 end
 ```

data/carnivore-unixsocket.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |s|
   s.description = 'Carnivore Unix Socket Source'
   s.license = 'Apache 2.0'
   s.require_path = 'lib'
-  s.add_dependency 'carnivore', '>= 0.1.8'
-  s.add_dependency 'celluloid-io'
-  s.files = Dir['**/*']
+  s.add_dependency 'carnivore', '>= 1.0'
+  s.files = Dir['lib/**/*'] + %w(carnivore-unixsocket.gemspec README.md CHANGELOG.md)
 end

data/lib/carnivore-unixsocket/unixsocket.rb

@@ -5,8 +5,7 @@ module Carnivore
     # Unix socket based carnivore source
     class UnixSocket < Source
 
-      # max time for unix socket to setup
-      INIT_SRV_TIMEOUT = 2.0
+      option :cache_signals
 
       # @return [String] path to socket
       attr_reader :socket
@@ -19,6 +18,7 @@ module Carnivore
       #
       # @param args [Hash]
       def setup(args={})
+        @write_lock = Mutex.new
         @socket = ::File.expand_path(args[:path])
         @srv_name = "socket_srv_#{name}".to_sym
         @connection = nil
@@ -27,40 +27,34 @@ module Carnivore
 
       # @return [Util::Server]
       def server
-        callback_supervisor[srv_name]
+        @server
       end
 
       # @return [Celluloid::IO::UNIXSocket]
       def connection
         unless(@connection)
-          @connection = Celluloid::IO::UNIXSocket.new(socket)
+          @connection = UNIXSocket.new(socket)
         end
         @connection
       end
 
       # Initialize the server
       def init_srv
-        callback_supervisor.supervise_as(srv_name,
-          Carnivore::UnixSocket::Util::Server,
-          init_args.merge(:notify_actor => current_actor)
+        @server = Util::Server.new(
+          :path => socket,
+          :source => current_self
         )
-        waited = 0.0
-        until(server || waited > INIT_SRV_TIMEOUT)
-          sleep(0.01)
-          waited += 0.01
-        end
-        server.async.start
+        @server.async.start_collector!
+        @server.async.start_server!
       end
 
       # Receive messages
       def receive(*args)
-        wait(:new_socket_lines)
-        server.return_lines.map do |line|
-          begin
-            MultiJson.load(line)
-          rescue MultiJson::ParseError
-            line
-          end
+        line = wait(:message)
+        begin
+          MultiJson.load(line)
+        rescue MultiJson::ParseError
+          line
         end
       end
 
@@ -70,8 +64,12 @@ module Carnivore
       # @param original_message [Carnivore::Message]
       def transmit(payload, original_message=nil)
         output = payload.is_a?(String) ? payload : MultiJson.dump(payload)
-        connection.puts(output)
-        connection.flush
+        @write_lock.synchronize do
+          defer do
+            connection.puts(output)
+            connection.flush
+          end
+        end
       end
 
       # Override processing to enable server only if required

data/lib/carnivore-unixsocket/util/socket_server.rb

@@ -1,60 +1,97 @@
+require 'socket'
 require 'carnivore-unixsocket'
-require 'celluloid/io'
 
 module Carnivore
   module UnixSocket
     module Util
       class Server
 
-        include Celluloid
+        include Zoidberg::SoftShell
+        include Zoidberg::Supervise
         include Carnivore::Utils::Logging
 
-        attr_reader :path, :notify_actor, :server, :supervisor
+        # @return [String] socket path
+        attr_reader :path
+        # @return [UNIXServer]
+        attr_reader :server
+        # @return [Source]
+        attr_reader :source
+        # @return [IO]
+        attr_reader :waker
 
+        # Create a new server
+        #
+        # @param args [Hash]
+        # @option args [String] :path socket path
+        # @return [self]
         def initialize(args={})
           @path = ::File.expand_path(args[:path])
-          @notify_actor = args[:notify_actor]
-          @supervisor = Celluloid::SupervisionGroup.run!
-          @messages = []
+          @source = args[:source]
+          @connections = []
+          @waker = IO.pipe.last
         end
 
-        def start
-          srv_actor = current_actor
-          defer do
-            loop do
-              setup_server!
-              debug 'Waiting for new connection to server'
-              connection = server.accept
-              debug 'Received new connection to server. Setting up connection...'
-              supervisor.supervise_as("con_#{connection.hash}", Connection,
-                :io => connection, :server => srv_actor, :auto_consume => true
-              )
-              debug 'Connection setup complete and active'
+        # Add a new connection
+        #
+        # @param con [UNIXSocket]
+        # @return [NilClass]
+        def add_connection(con)
+          @connections.push(con)
+          waker.write '-'
+          nil
+        end
+
+        # Remove a connection
+        #
+        # @param con [UNIXSocket]
+        # @return [NilClass]
+        def remove_connection(con)
+          @connections.delete(con)
+          waker.write '-'
+          nil
+        end
+
+        # Start the server listener loop
+        def start_server!
+          setup_server!
+          loop do
+            debug 'Waiting for new connection to socket'
+            connection = server.accept
+            debug 'Received new connection to socket, loading in...'
+            add_connection(connection)
+          end
+        end
+
+        # Start the message collector loop
+        def start_collector!
+          loop do
+            IO.select(current_self.connections + [waker]).flatten.compact.each do |sock|
+              if(sock == waker)
+                sock.read
+              else
+                line = sock.gets
+                if(line)
+                  source.signal(:message, line.strip)
+                else
+                  sock.close
+                end
+              end
             end
           end
         end
 
+        # Setup the path for the server and create new server
+        #
+        # @return [UNIXServer]
         def setup_server!
           unless(@server)
             if(::File.exists?(path))
               ::File.delete(path)
             end
-            @server = Celluloid::IO::UNIXServer.new(path)
+            @server = UNIXServer.new(path)
           end
         end
 
-        def add_lines(lines)
-          lines = [lines] unless lines.is_a?(Array)
-          @messages += lines
-          notify_actor.signal(:new_socket_lines)
-        end
-
-        def return_lines
-          msgs = @messages.dup
-          @messages.clear
-          msgs
-        end
-
       end
     end
   end

data/lib/carnivore-unixsocket/util.rb

@@ -3,10 +3,7 @@ require 'carnivore-unixsocket'
 module Carnivore
   module UnixSocket
     module Util
-
-      autoload :Connection, 'carnivore-unixsocket/util/socket_connection'
       autoload :Server, 'carnivore-unixsocket/util/socket_server'
-
     end
   end
 end

data/lib/carnivore-unixsocket/version.rb

@@ -1,6 +1,6 @@
 module Carnivore
   module UnixSocket
     # current library version
-    VERSION = Gem::Version.new('0.1.0')
+    VERSION = Gem::Version.new('0.2.0')
   end
 end

data/lib/carnivore-unixsocket.rb

@@ -1,4 +1,3 @@
-require 'celluloid/io'
 require 'carnivore'
 
 module Carnivore

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-unixsocket
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
-- !ruby/object:Gem::Dependency
-  name: celluloid-io
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Carnivore Unix Socket Source
 email: chrisroberts.code@gmail.com
 executables: []
@@ -45,14 +31,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- CONTRIBUTING.md
-- LICENSE
 - README.md
 - carnivore-unixsocket.gemspec
 - lib/carnivore-unixsocket.rb
 - lib/carnivore-unixsocket/unixsocket.rb
 - lib/carnivore-unixsocket/util.rb
-- lib/carnivore-unixsocket/util/socket_connection.rb
 - lib/carnivore-unixsocket/util/socket_server.rb
 - lib/carnivore-unixsocket/version.rb
 homepage: https://github.com/carnivore-rb/carnivore-unixsocket
@@ -75,9 +58,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Message processing helper
 test_files: []
-has_rdoc: 

data/CONTRIBUTING.md

@@ -1,25 +0,0 @@
-# Contributing
-
-## Branches
-
-### `master` branch
-
-The master branch is the current stable released version.
-
-### `develop` branch
-
-The develop branch is the current edge of development.
-
-## Pull requests
-
-* https://github.com/carnivore-rb/carnivore-unixsocket/pulls
-
-Please base all pull requests of the `develop` branch. Merges to
-`master` only occur through the `develop` branch. Pull requests
-based on `master` will likely be cherry picked.
-
-## Issues
-
-Need to report an issue? Use the github issues:
-
-* https://github.com/carnivore-rb/carnivore-unixsocket/issues

data/LICENSE

@@ -1,13 +0,0 @@
-   Copyright 2014 Chris Roberts
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

data/lib/carnivore-unixsocket/util/socket_connection.rb

@@ -1,48 +0,0 @@
-require 'carnivore-unixsocket'
-
-module Carnivore
-  module UnixSocket
-    module Util
-      class Connection
-
-        include Celluloid
-
-        attr_reader :srv, :io
-
-        def initialize(args={})
-          @io = args[:io]
-          @io.sync
-          @srv = args[:server]
-          async.consume! if args[:auto_consume]
-        end
-
-        def consume!
-          defer do
-            loop do
-              line = receive
-              unless(line.empty?)
-                srv.add_lines([line])
-              end
-            end
-          end
-        end
-
-        def write_line(s)
-          io.puts s
-          io.flush
-        end
-
-        def receive
-          line = io.gets
-          if(line)
-            line.strip
-          else
-            io.close
-            terminate
-          end
-        end
-
-      end
-    end
-  end
-end