deac/LogAn
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

LogAn::Inc::Fileparser::Line#event_line added and modified #event_read

Browse source
This commit is contained in:
Denis Knauf 2010-04-02 16:49:45 +02:00
parent b7d6689225
commit 7a244cd465
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/logan/inc/fileparser.rb
View file

@ -30,14 +30,16 @@ module LogAn
@buffer, @linebuffer = Select::Buffer.new( ''), Select::Buffer.new( '') @buffer, @linebuffer = Select::Buffer.new( ''), Select::Buffer.new( '')
end end
def event_read str, sock def event_read str, sock = nil
@buffer += str @buffer += str
@buffer.each! @delimiter do |line| @buffer.each! @delimiter, &method( :event_line)
end
def event_line line
emit line emit line
seeks line.length seeks line.length
end end
end end
end
class Multiline < Line class Multiline < Line
def initialize sid, delimiter = nil, multiline = nil def initialize sid, delimiter = nil, multiline = nil
@ -45,9 +47,7 @@ module LogAn
@multiline = multiline || /^\d\d-\d\d-\d\d:/ @multiline = multiline || /^\d\d-\d\d-\d\d:/
end end
def event_read str, sock def event_line line
@buffer += str
@buffer.each! @delimiter do |line|
if line =~ @multiline if line =~ @multiline
emit @linebuffer.to_s emit @linebuffer.to_s
seeks @linebuffer.length seeks @linebuffer.length
@ -59,4 +59,3 @@ module LogAn
end end
end end
end end
end

17
lib/logan/inc/main.rb
View file

@ -51,9 +51,9 @@ module LogAn::Inc
# : Server-Configuration. default { port: 1087 } # : Server-Configuration. default { port: 1087 }
def initialize conf def initialize conf
super super
@conf = {}
# Copy config - changes possible # Copy config - changes possible
@conf = {}
conf.each {|key, val| @conf[key]= val } conf.each {|key, val| @conf[key]= val }
# Default directories # Default directories
@ -90,13 +90,7 @@ module LogAn::Inc
# Select-framework # Select-framework
@select = LogAn::Inc::Select.new @select = LogAn::Inc::Select.new
status = lambda do status # Init Status
@select.at Time.now+5, &status
LogAn::Logging.info :recv_lines => @logs.counter,
:connections => @serv && @serv.clients.map {|cl| cl.sock.peeraddr }
@conf[:stores].each {|key, db| db.flush!}
end
status.call
# Prepare Inc-server - create server # Prepare Inc-server - create server
@serv = LogAn::Inc::Server.new :sock => TCPServer.new( *@conf[:server]), @serv = LogAn::Inc::Server.new :sock => TCPServer.new( *@conf[:server]),
@ -112,6 +106,13 @@ module LogAn::Inc
raise $! raise $!
end end
def status
LogAn::Logging.info :recv_lines => @logs.counter,
:connections => @serv && @serv.clients.map {|cl| cl.sock.peeraddr }
@conf[ :stores].each {|key, db| db.flush!}
@select.at Time.now+5, &status
end
# Will be called at exit. Will close all opened BDB::Env # Will be called at exit. Will close all opened BDB::Env
def at_exit def at_exit
LogAn::Logging.info :at_exit LogAn::Logging.info :at_exit