glo-logging-server-client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47b826a3bc93a65a22116998513e255bde3ffad3
-  data.tar.gz: 4d22228384b2292ab499eb2a2dcfb08b79ee8968
+  metadata.gz: 903724353811d3e8e23c8c15319927096a792c02
+  data.tar.gz: 0a13930a2563d09898ba9881d6461d2b63539c1f
 SHA512:
-  metadata.gz: 3df5c5970740421a74da8d8eafe116f565d823043dc2a8e29384f48a001c1e87502f949369266978a976b6eeae751b36c5ecaeb6bac48b1c8546b0be2440f28f
-  data.tar.gz: 4a505ff7eb21bc63c99e7586c86945dbb0aac0e057f38e9b61077392961523064188f753acde26e6af92d10491b5beaea18792be30014ec4f2ca05cab0b4606d
+  metadata.gz: 4cfbc9b263d86d31532fca3c46a9dbcbb1478fc85c2ecda44ad4843278fac4c7f0328588461bb6130000fb757f5a4ec08d8dee519ef73475e4d10b7d18003fba
+  data.tar.gz: 3d058df58c54060c879d89a8aa7864e4d18ad196073ecdf320434084ac6a9e9c5913569e46dff70d2e379023df9d21a412807d6c0a297b6074cd27d9151d8f13

data/lib/glo-logging-server-client.rb

@@ -1,6 +1,7 @@
 require 'timeout'
 require 'redis'
 require 'json'
+require 'socket'
 
 module GLO
 		module LOG

data/lib/glo-logging-server-client/client.rb

@@ -1,11 +1,10 @@
 module GLO::LOG
 	class Client
-		def initialize ( app )
-			@conn = GLO::LOG::Conn.new( app )
+		def initialize ( target, app )
+			@conn = GLO::LOG::Conn.new( target, app )
 		end
 		def log ( log_level, msg, tag )
-			ts = Time.now
-			@conn.log( log_level, msg, tag, ts )
+			@conn.log( log_level, msg, tag)
 		end
 	end
 end

data/lib/glo-logging-server-client/conn.rb

@@ -1,11 +1,105 @@
 module GLO::LOG
 	class Conn
-		def initialize ( app )
-			@redis = Redis.new
-			@data = { 'app' => app }
+
+		def initialize ( target, app )
+
+			if target =~ /(.+)\:(\d+)$/i
+				@host = $~[1]
+				@port = $~[2]
+			else
+				@host = target
+				@port = nil
+			end
+
+			@app = app
+			@max_tries = 6
+			@socket = nil
 		end
-		def log ( log_level, msg, tag, ts )
-			@redis.publish 'node', @data.merge( 'log_level' => log_level, 'msg' => msg, 'tag' => tag, 'time' => ts).to_json
+
+		def log ( log_level ='debug' , msg = '' , tag = {})
+			tries = 0
+			connect( @host, @port )
+			data = {'app' => @app, 'log_level' => log_level,'message'=>msg,'tag'=>tag}.to_json
+			data_size = data.size.to_s
+			begin
+				write "*2\r\n$3\r\nLOG\r\n$"+data_size+"\r\n"+data+"\r\n"
+			rescue Exception => e
+				$stderr.puts "Failed to write to server! Retrying... ( #{tries} )"
+
+				if @max_tries == -1 || tries < @max_tries
+					tries += 1
+					close_possibly_dead_conn(tries)
+					reconnect
+					retry
+				else
+					raise e
+				end
+
+			end
+
 		end
+		def flush
+			@socket.flush unless @socket.nil
+		end
+
+		def close
+			@socket.nil? ? nil : @socket.close rescue nil
+		end
+
+		def closed?
+			@socket.nil? ? true : @socket.closed?
+		end
+
+		def reconnect!
+			close unless closed?
+			connect( @host, @port )
+		end
+
+		alias :reconnect :reconnect!
+
+		def connect(host, port)
+			if @socket.nil? || @socket.closed?
+				real_connect(host, port)
+			else
+					@socket
+			end
+		end
+
+		def real_connect(host, port)
+			tries = 0
+			begin
+				@socket = TCPSocket.new( host, port)
+				raise "Unable to create socket!" if @socket.nil?
+			rescue Exception => e
+				$stderr.puts "Fauled to establish connection with server! Retrying..( #{tries} )" unless @max_tries == -1
+				if @max_tries == -1 || tries < @max_tries
+					tries += 1
+					close_possibly_dead_conn(tries)
+					retry
+				else
+					raise e
+				end
+			end
+		end
+
+		def write ( msg, flush = false )
+			conn_timeout do
+				wrtlen = @socket.write(msg)
+			end
+			self.flush if flush
+			@socket
+		end
+
+		def close_possibly_dead_conn( tries = 0)
+			close unless @socket.nil? || closed?
+			@socket = nil
+			select(nil,nil,nil, tries * 0.2) if tries > 0
+			@socket
+		end
+
+		def conn_timeout( &block )
+			::Timeout::timeout( 6, GLO::LOG::Timeout, &block )
+		end
+
 	end
 end

data/lib/glo-logging-server-client/logger.rb

@@ -6,8 +6,8 @@ module GLO::LOG
 
     attr_accessor :level
 
-    def initialize(app = 'default')
-      super(app)
+    def initialize(target = '127.0.0.1:1000', app = 'default')
+      super( target, app )
       @level = INFO
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glo-logging-server-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
-- YOURNAME
+- Gideon Rosales
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies: []
 description: client
 email: gideonrosales@gmail.com
@@ -22,7 +22,7 @@ files:
 - lib/glo-logging-server-client/logger.rb
 homepage: http://rubygems.org/gems/glo-logging-server-client
 licenses:
-- MIT
+- BSD
 metadata: {}
 post_install_message: 
 rdoc_options: []