@@ -1,11 +1,10 @@ default: - name: Marvin + user: MarvinBot + name: MarvinBot + nick: MarvinBot nicks: - MarvinBot1000 - MarvinBot2000 - MarvinBot3000 - MarvinusBoticus -development: - user: MarvinBot - name: MarvinBot - nick: MarvinBot \ No newline at end of file + distributed_server: false \ No newline at end of file config/settings.yml.sample @@ -14,13 +14,11 @@ Marvin::Loader.before_run do # Conditional registration - load the distributed dispatcher # if an actual client, otherwise use the normal handlers. # - if Marvin::Loader.distributed_client? - HelloWorld.register! - DebugHandler.register! - else - Marvin::Distributed::Handler.register! - end - + # if Marvin::Loader.distributed_client? + # + # DebugHandler.register! + # else + # Marvin::Distributed::Handler.register! # end # And any other code here that will be run before the client, e.g: config/setup.rb @@ -34,8 +34,6 @@ module Marvin logger.info "Initializing the current instance" @channels = [] connections << self - logger.info "Setting the client for each handler" - setup_handlers logger.info "Dispatching the default :client_connected event" dispatch :client_connected end @@ -60,9 +58,9 @@ module Marvin Marvin::Reloading.reload! if @@development end - def dispatch(*args) + def pre_dispatching process_development - super + setup_handlers end # Sets the current class-wide settings of this IRC Client lib/marvin/abstract_client.rb @@ -52,7 +52,7 @@ module Marvin::IRC def receive_line(line) return unless @connected line = line.strip - logger.debug "<< #{line}" + logger.debug "[#{host_with_port}] << #{line}" @client.receive_line(line) rescue Exception => e logger.warn "Uncaught exception raised; Likely in Marvin" @@ -62,7 +62,7 @@ module Marvin::IRC def send_line(*lines) return unless @connected lines.each do |line| - logger.debug ">> #{line.strip}" + logger.debug "[#{host_with_port}] >> #{line.strip}" send_data line end end lib/marvin/irc/client.rb bbf804dd38e9f5f528fa1634e21e04eb4616de3c Darcy Laycock sutto@sutto.net http://github.com/Sutto/marvin/commit/14fdeb687e5d6fabd72efa985a90b6c8a2ed9694 14fdeb687e5d6fabd72efa985a90b6c8a2ed9694 2009-10-05T07:07:35-07:00 2009-10-05T07:07:35-07:00 Properly setup handlers and log the connection for incoming / outgoing data 0942bbd356f1b41a8d97e52b1fb5322cd0fceabd Darcy Laycock sutto@sutto.net