@@ -1,7 +1,2 @@ -Oh hai there. -Welcome to Kookaburra - the Ruby -IRC daemon with drb access. - -Kookaburra is built on top of -ruby-ircd. \ No newline at end of file + * Welcome to Kookaburra v0.1 - a Ruby IRCD. * data/motd @@ -56,7 +56,9 @@ module Kookaburra def run! begin EventMachine::run do - EventMachine::add_periodic_timer(90) { Kookaburra::IRC::Server.ping_all } + EventMachine::add_periodic_timer(60) do + Kookaburra::IRC::Server.ping_all + end EventMachine::start_server "0.0.0.0", Kookaburra::Settings.port, Kookaburra::IRC::Server end rescue Exception => e lib/kookaburra/base_extension.rb @@ -74,19 +74,13 @@ module Kookaburra else #check if we are just nicking ourselves. unless Kookaburra::Stores.users[s] == self - #verify the connectivity of earlier guy - unless Kookaburra::Stores.users[s].closed? - reply :numeric, Replies::ERR_NICKNAMEINUSE,"* #{s} ","Nickname is already in use." - @nick_tries += 1 - if @nick_tries > Kookaburra::Settings.max_nick_tries - Kookaburra.logger.info "Kicking user #{s} after #{@nick_tries} failed nick attempts" - handle_abort - end - return - else - Kookaburra::Stores.users[s].handle_abort - Kookaburra::Stores.users[s] = self + reply :numeric, Replies::ERR_NICKNAMEINUSE, "* #{s} ","Nickname is already in use." + @nick_tries += 1 + if @nick_tries > Kookaburra::Settings.max_nick_tries + Kookaburra.logger.info "Kicking user #{s} after #{@nick_tries} failed nick attempts" + handle_abort end + return end end @nick_tries = 0 lib/kookaburra/irc/client.rb @@ -108,8 +108,9 @@ module Kookaburra end def self.ping_all + Kookaburra.logger.info "Pinging all users" Kookaburra::Stores.users.each_user do |client| - client.send_ping + client.send_ping end end lib/kookaburra/irc/server.rb @@ -1,5 +1,7 @@ require 'drb' +# Ugly ass DRB message server class. +# Needs to be seriously refactored. class MessageServer def self.stored_messages_path; File.join(Kookaburra.root, "data/messages"); end lib/message_server.rb bcc41a245391919c8146059d2b07574e957b4d6b Darcy Laycock sutto@sutto.net http://github.com/Sutto/kookaburra-server/commit/0e8aef95f78b4d89a86c849ea00a891967a41b10 0e8aef95f78b4d89a86c849ea00a891967a41b10 2008-11-05T15:14:06-08:00 2008-11-05T15:14:06-08:00 More work towards refactoring out the server stuff / simplifying and ultimately cleaning it all up 5a31be47757a8054c0e7beaa2ccca1c4894d828d Darcy Laycock sutto@sutto.net