mod_spox 0.0.3 → 0.0.4

data/lib/mod_spox/Bot.rb

@@ -30,20 +30,21 @@ module ModSpox
             @socket = nil
             @nick = nil
             @thread = Thread.current
+            @waiter = Monitors::Boolean.new
             hook_pipeline
         end
         
         # Run the bot
         def run
-            trap('SIGTERM'){ Logger.log("Caught SIGTERM"); Thread.current.exit }
-            trap('SIGKILL'){ Logger.log("Caught SIGKILL"); Thread.current.exit }
-            trap('SIGINT'){ Logger.log("Caught SIGINT"); Thread.current.exit }
-            trap('SIGQUIT'){ Logger.log("Caught SIGQUIT"); Thread.current.exit }
+            trap('SIGTERM'){ Logger.log("Caught SIGTERM"); @shutdown = true; @waiter.wakeup; sleep(0.1); Thread.current.exit }
+            trap('SIGKILL'){ Logger.log("Caught SIGKILL"); @shutdown = true; @waiter.wakeup; sleep(0.1); Thread.current.exit }
+            trap('SIGINT'){ Logger.log("Caught SIGINT"); @shutdown = true; @waiter.wakeup; sleep(0.1); Thread.current.exit }
+            trap('SIGQUIT'){ Logger.log("Caught SIGQUIT"); @shutdown = true; @waiter.wakeup; sleep(0.1); Thread.current.exit }
             until @shutdown do
                 @timer.start
                 @pipeline << Messages::Internal::BotInitialized.new
                 begin
-                    Thread.stop
+                    @waiter.wait
                 rescue Object => boom
                     Logger.log("Caught exception: #{boom}")
                 end

data/lib/mod_spox/BotConfig.rb

@@ -21,7 +21,7 @@ module ModSpox
             }
             if(gem)
                 p = gem.full_gem_path
-                up = Etc.getpwnam(Etc.getlogin).dir
+                up = $MOD_SPOX_PATH.nil? ? Etc.getpwnam(Etc.getlogin).dir : $MOD_SPOX_PATH
                 @@config = {:basepath => p,
                            :libpath => "#{p}/lib/mod_spox",
                            :datapath => "#{p}/data/mod_spox",

data/lib/mod_spox/ConfigurationWizard.rb

@@ -27,7 +27,8 @@ module ModSpox
             @config << {:id => :admin_nick, :string => 'Administrator nick: ', :regex => '[a-zA-Z].*', :default => nil, :value => nil, :echo => true}
             @config << {:id => :admin_password, :string => 'Administrator password: ', :regex => '.+', :default => nil, :value => nil, :echo => false}
             @config << {:id => :plugin_directory, :string => 'Plugin directory (bot must have write priviliges): ', :regex => '.+', :default => nil, :echo => true}
-            @config << {:id => :trigger, :string => 'Trigger character for plugins: ', :regex => '.', :default => '!', :value => nil, :echo => true}            
+            @config << {:id => :trigger, :string => 'Trigger character for plugins: ', :regex => '.', :default => '!', :value => nil, :echo => true}
+            @config << {:id => :memcache, :string => 'Use memcache (EXPERIMENTAL): ', :regex => '(yes|no)', :default => 'no', :value => nil, :echo => true}            
             @stuck_visible = true
             begin
                 require 'termios'
@@ -66,7 +67,7 @@ module ModSpox
         def save_configuration
             config = BaseConfig.new(BotConfig[:userconfigpath])
             @config.each{|value|
-                config[value[:id]] = value[:value] if value[:id].to_s =~ /^db/
+                config[value[:id]] = value[:value] if value[:id].to_s =~ /^(db|memcache)/
             }
             config.write_configuration
             initialize_bot
@@ -117,7 +118,7 @@ module ModSpox
             return response
         end
         
-        # output:: text to send before user input
+        # output:: varchar(255) to send before user input
         # regex:: pattern user input must match (^ and $ not need. applied automatically)
         # echo:: echo user's input
         # default:: default value if no value is entered
@@ -143,24 +144,24 @@ module ModSpox
                     Database.db << "CREATE TABLE IF NOT EXISTS nick_modes (id integer primary key auto_increment not null, mode varchar(255) not null, nick_id int not null references nicks, channel_id int references channels, unique index nick_modes_nick_id_channel_id_index (nick_id, channel_id))"
                     Database.db << "CREATE TABLE IF NOT EXISTS servers (id int not null auto_increment primary key, host varchar(255) not null, port int not null default 6667, priority int not null default 0, connected boolean not null default false, unique index servers_server_port_index (server, port))"
                     Database.db << "CREATE TABLE IF NOT EXISTS settings (id int not null auto_increment primary key, name varchar(255) not null unique, value text)"
-                    Database.db << "CREATE TABLE IF NOT EXISTS signatures (id int not null auto_increment primary key, signature varchar(255) not null, params varchar(255), group_id int default null references groups, method varchar(255) not null, plugin varchar(255) not null, description text, requirement enum('public', 'private', 'both') default 'both' not null)"
+                    Database.db << "CREATE TABLE IF NOT EXISTS signatures (id int not null auto_increment primary key, signature varchar(255) not null, params varchar(255), group_id int default null references groups, method varchar(255) not null, plugin varchar(255) not null, description varchar(255), requirement enum('public', 'private', 'both') default 'both' not null)"
                     Database.db << "CREATE TABLE IF NOT EXISTS triggers (id int not null auto_increment primary key, `trigger` varchar(255) unique not null, active boolean not null default false)"
                     Database.db << "CREATE TABLE IF NOT EXISTS groups (id int not null auto_increment primary key, name varchar(255) not null unique)"
                     Database.db << "CREATE TABLE IF NOT EXISTS auth_groups (auth_id int not null references auths, group_id int not null references groups, primary key(auth_id, group_id))"
                 when :pgsql
-                    Database.db << "CREATE TYPE sig_requirement AS ENUM ('public', 'private', 'both')"
-                    Database.db << "CREATE TABLE nicks (id serial not null primary key, nick text unique not null, username text, real_name text, address text, source text, connected_at timestamp, connected_to text, seconds_idle integer, visible boolean not null default false, away boolean not null default false, botnick boolean not null default false)"
-                    Database.db << "CREATE TABLE channels (id serial not null primary key, name text unique not null, password text, autojoin boolean not null default false, topic text, quiet boolean not null default false, parked boolean not null default false)"
-                    Database.db << "CREATE TABLE auths (id serial not null primary key, password text, services boolean not null default false, mask text unique, authed boolean not null default false, nick_id integer unique references nicks)"
-                    Database.db << "CREATE TABLE groups (id serial not null primary key, name text unique not null)"
-                    Database.db << "CREATE TABLE channel_modes (id serial not null primary key, mode text not null, channel_id integer unique not null references channels)"
-                    Database.db << "CREATE TABLE configs (id serial not null primary key, name text unique not null, value text)"
+                    Database.db << "CREATE TABLE nicks (id serial not null primary key, nick varchar(255) unique not null, username varchar(255), real_name varchar(255), address varchar(255), source varchar(255), connected_at timestamp, connected_to varchar(255), seconds_idle integer, visible boolean not null default false, away boolean not null default false, botnick boolean not null default false)"
+                    Database.db << "CREATE INDEX nick_nicks_lower on nicks (lower(nick))"
+                    Database.db << "CREATE TABLE channels (id serial not null primary key, name varchar(255) unique not null, password varchar(255), autojoin boolean not null default false, topic varchar(255), quiet boolean not null default false, parked boolean not null default false)"
+                    Database.db << "CREATE TABLE auths (id serial not null primary key, password varchar(255), services boolean not null default false, mask varchar(255) unique, authed boolean not null default false, nick_id integer unique references nicks)"
+                    Database.db << "CREATE TABLE groups (id serial not null primary key, name varchar(255) unique not null)"
+                    Database.db << "CREATE TABLE channel_modes (id serial not null primary key, mode varchar(255) not null, channel_id integer unique not null references channels)"
+                    Database.db << "CREATE TABLE configs (id serial not null primary key, name varchar(255) unique not null, value text)"
                     Database.db << "CREATE TABLE nick_channels (channel_id integer not null references channels, nick_id integer not null references nicks, primary key(nick_id, channel_id))"
-                    Database.db << "CREATE TABLE nick_modes (id serial not null primary key, mode text not null, nick_id integer not null references nicks, channel_id integer references channels, unique (nick_id, channel_id))"
-                    Database.db << "CREATE TABLE servers (id serial not null primary key, host text not null, port integer not null default 6667, priority integer not null default 0, connected boolean not null default false, unique (host, port))"
-                    Database.db << "CREATE TABLE signatures (id serial not null primary key, signature text not null, params text, group_id integer default null references groups, method text not null, plugin text not null, description text, requirement sig_requirement default 'both' not null)"
-                    Database.db << "CREATE TABLE settings (id serial not null primary key, name text unique not null, value text)"
-                    Database.db << "CREATE TABLE triggers (id serial not null primary key, trigger text unique not null, active boolean not null default false)"
+                    Database.db << "CREATE TABLE nick_modes (id serial not null primary key, mode varchar(255) not null, nick_id integer not null references nicks, channel_id integer references channels, unique (nick_id, channel_id))"
+                    Database.db << "CREATE TABLE servers (id serial not null primary key, host varchar(255) not null, port integer not null default 6667, priority integer not null default 0, connected boolean not null default false, unique (host, port))"
+                    Database.db << "CREATE TABLE signatures (id serial not null primary key, signature varchar(255) not null, params varchar(255), group_id integer default null references groups, method varchar(255) not null, plugin varchar(255) not null, description varchar(255), requirement varchar(255) default 'both' not null)"
+                    Database.db << "CREATE TABLE settings (id serial not null primary key, name varchar(255) unique not null, value varchar(255))"
+                    Database.db << "CREATE TABLE triggers (id serial not null primary key, trigger varchar(255) unique not null, active boolean not null default false)"
                     Database.db << "CREATE TABLE auth_groups (auth_id integer not null references auths, group_id integer not null references groups, primary key (auth_id, group_id))"
                 when :sqlite
                     Database.db << "CREATE TABLE if not exists nicks (id integer PRIMARY KEY AUTOINCREMENT, nick string UNIQUE NOT NULL COLLATE NOCASE, username string, real_name string, address string, source string, connected_at timestamp, connected_to string, seconds_idle integer, visible boolean NOT NULL DEFAULT 'f', away boolean NOT NULL DEFAULT 'f', botnick boolean NOT NULL DEFAULT 'f')"
@@ -174,7 +175,7 @@ module ModSpox
                     Database.db << "CREATE TABLE if not exists servers (id integer primary key autoincrement, host string NOT NULL, port integer NOT NULL DEFAULT 6667, priority integer NOT NULL DEFAULT 0, connected boolean NOT NULL DEFAULT 'f')"
                     Database.db << "CREATE UNIQUE INDEX if not exists servers_host_port_index on servers (host, port)"
                     Database.db << "CREATE TABLE if not exists settings (id integer PRIMARY KEY AUTOINCREMENT, name string UNIQUE NOT NULL, value text)"
-                    Database.db << "CREATE TABLE if not exists signatures (id integer PRIMARY KEY AUTOINCREMENT, signature string NOT NULL UNIQUE, params string, group_id integer DEFAULT NULL REFERENCES groups, method string NOT NULL, plugin string NOT NULL, description text, requirement text not null default 'both')"
+                    Database.db << "CREATE TABLE if not exists signatures (id integer PRIMARY KEY AUTOINCREMENT, signature string NOT NULL UNIQUE, params string, group_id integer DEFAULT NULL REFERENCES groups, method string NOT NULL, plugin string NOT NULL, description varchar(255), requirement varchar(255) not null default 'both')"
                     Database.db << "CREATE TABLE if not exists triggers (id integer PRIMARY KEY AUTOINCREMENT, trigger string UNIQUE NOT NULL, active boolean NOT NULL DEFAULT 'f')"            
                     Database.db << "CREATE TABLE if not exists groups (id integer PRIMARY KEY AUTOINCREMENT, name string UNIQUE NOT NULL COLLATE NOCASE)"
                     Database.db << "CREATE TABLE if not exists auth_groups(auth_id integer REFERENCES auths, group_id integer REFERENCES groups)"

data/lib/mod_spox/Database.rb

@@ -12,6 +12,15 @@ module ModSpox
             @@type = type
         end
         
+        def self.cache=(cache)
+            @@cache = nil
+            @@cache = cache
+        end
+        
+        def self.cache
+            return Database.class_variable_defined?(:@@cache) ? @@cache : nil
+        end
+        
         def self.type
             return Database.class_variable_defined?(:@@type) ? @@type : nil
         end

data/lib/mod_spox/Helpers.rb

@@ -54,5 +54,54 @@ module ModSpox
                 raise "Failed to process URL. #{boom}"
             end
         end
+        
+        # string:: name of target
+        # Locates target model and returns it. String can be a nick
+        # or channel name. If the string given does not match the required
+        # pattern for a channel or nick, the string is returned.
+        def Helpers.find_model(string, create=true)
+            @@channel_cache = {} unless Helpers.class_variable_defined?(:@@channel_cache)
+            @@nick_cache = {} unless Helpers.class_variable_defined?(:@@nick_cache)
+            if(string =~ /^[A-Za-z\|\\\{\}\[\]\^\`~\_\-]+[A-Za-z0-9\|\\\{\}\[\]\^\`~\_\-]*$/)
+                Logger.log("Model: #{string} -> Nick")
+                nick = nil
+                if(@@nick_cache.has_key?(string.to_sym))
+                    begin
+                        nick = Models::Nick[@@nick_cache[string.to_sym]]
+                        Logger.log("Handler cache hit for nick: #{string}", 30)
+                    rescue Object => boom
+                        Logger.log("Failed to grab cached nick: #{boom}")
+                    end
+                end
+                unless(nick)
+                    nick = Models::Nick.locate(string, create)
+                    @@nick_cache[string.to_sym] = nick.pk if nick.is_a?(Models::Nick)
+                    Logger.log("Nick was retrieved from database")
+                end
+                return nick
+            elsif(string =~ /^[&#+!]/)
+                Logger.log("Model: #{string} -> Channel")
+                if(@@channel_cache.has_key?(string.to_sym))
+                    begin
+                        channel = Models::Channel[@@channel_cache[string.to_sym]]
+                        Logger.log("Handler cache hit for channel: #{string}", 30)
+                    rescue Object => boom
+                        Logger.log("Failed to grab cached channel: #{boom}")
+                    end
+                end
+                unless(channel)
+                    channel = Models::Channel.locate(string, create)
+                    @@channel_cache[string.to_sym] = channel.pk if channel.is_a?(Models::Channel)
+                    Logger.log("Channel was retrieved from database")
+                end
+                return channel
+            elsif(model = Models::Server.filter(:host => string, :connected => true).first)
+                Logger.log("Model: #{string} -> Server")
+                return model
+            else
+                Logger.log("FAIL Model: #{string} -> No match")
+                return string
+            end
+        end
     end
 end

data/lib/mod_spox/Loader.rb

@@ -61,7 +61,18 @@ module ModSpox
         require 'mod_spox/BotConfig'
         require 'mod_spox/BaseConfig'
         require 'mod_spox/Database'
+        memcache = false
         config = BaseConfig.new(BotConfig[:userconfigpath])
+        if(config[:memcache] == 'on')
+            begin
+                require 'memcache'
+                memcache = true
+                Database.cache = MemCache.new('localhost:11211', :namespace => 'modspox')
+            rescue Object => boom
+                puts "FAILED TO LOAD MEMCACHE SUPPORT: #{boom}"
+                # do nothing #
+            end
+        end
         case config[:db_adapter]
             when 'mysql'
                 Database.db = Sequel.mysql(config[:db_database], :user => config[:db_username],

data/lib/mod_spox/PluginManager.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 module ModSpox
 
     class PluginManager

data/lib/mod_spox/Pool.rb

@@ -3,27 +3,6 @@ module ModSpox
     # The Pool class is used to reduce thread creation. It provides
     # an easy way to process many objects in an asynchronous manner.
     class Pool
-    
-        # 
-        def Pool.max_threads(num=nil)
-            if(num.nil?)
-                return @@max_threads
-            else
-                num = num.to_i
-                raise Exceptions::InvalidValue.new('Maximum threads setting must be a positive integer') if num < 1
-                @@max_threads = num
-            end
-        end
-        
-        def Pool.max_thread_life(num=nil)
-            if(num.nil?)
-                return @@max_thread_life
-            else
-                num = num.to_i
-                raise Exceptions::InvalidValue.new('Maximum thread life setting must be a positive integer') if num < 1
-                @@max_thread_life = num
-            end
-        end
 
         # Action thread is to perform
         attr_reader :proc
@@ -63,46 +42,21 @@ module ModSpox
         # Running pools
         @@pools = Array.new
         # Threads running in pool
-        @@threads = Hash.new
+        @@threads = Array.new
         # Lock for thread safety
         @@lock = Mutex.new
-        # Maximum number of threads in pool
-        @@max_threads = 10
         # Maximum number of seconds a thread may spend waiting for an action
-        @@max_thread_life = 60
-        # Thread to tend to pool actions
-        @@pool_thread = nil
+        @@max_exec_time = 60
         # Informs threads to halt
         @@kill = false
-        # Place for threads to wait for actions
-        @@thread_stopper = Monitors::Boolean.new
-        # Timer for the Pool thread
-        @@watcher_timer = Monitors::Timer.new
         
         # Adds a new thread to the pool
         def Pool.add_thread
-            if(@@threads.size < @@max_threads)
-                thread = Thread.new do
-                    sleep(0.01)
-                    until(@@kill) do
-                        Pool.schedule_thread
-                    end
+            @@threads << Thread.new do
+                until(Pool.max_queue_size < 1 || @@kill) do
+                    Pool.schedule_thread
                 end
-                @@threads[thread] = Time.now
-                Logger.log("New thread added to pool: #{thread}")
-            else
-                raise Exceptions::BotException.new("Reached maximum thread pool size: #{@@max_threads} threads")
-            end
-        end
-        
-        # thread:: Thread to delete
-        # Removes thread from pool
-        def Pool.delete_thread(thread)
-            @@lock.synchronize do
-                @@threads.delete(thread) if @@threads.has_key?(thread)
-                @@thread_stopper.remove_thread(thread)
-                thread.kill
-                Logger.log("Thread removed from thread pool: #{thread}")
+                @@threads.delete(Thread.current)
             end
         end
         
@@ -124,74 +78,36 @@ module ModSpox
                 end
             end
             unless(run_pool.nil?)
-                @@threads[Thread.current] = Time.now
-                run_pool.proc.call
-                @@threads[Thread.current] = Time.now
-            else
-                @@thread_stopper.wait
-            end
-        end
-        
-        # Starts the master thread for Pool maintanence
-        def Pool.start_watcher
-            @@pool_thread = Thread.new{
-                until(@@kill) do
-                    sleep_time = 0
-                    begin
-                        waiters = Pool.waiting_threads
-                        unless(waiters.empty?)
-                            waiters.each do |thread|
-                                time = Time.now.to_i - @@threads[thread].to_i
-                                sleep_time = (@@max_thread_life - time).to_i if sleep_time = 0 || (@@max_thread_life - time).to_i < sleep_time
-                                if(time > @@max_thread_life)
-                                    Pool.delete_thread(thread)
-                                elsif(!['sleep', 'run'].include?(thread.status))
-                                    Pool.delete_thread(thread)
-                                end
-                            end
-                        else
-                            if(Pool.max_queue_size > 0)
-                                Pool.add_thread
-                            end
-                        end
-                    rescue Object => boom
-                        Logger.log("Pool watcher caught an error (ignoring): #{boom}")
+                begin
+                    Timeout::timeout(@@max_exec_time) do
+                        run_pool.proc.call
                     end
-                    sleep_time = 1 if sleep_time == 0
-                    sleep_time = nil if sleep_time < 0
-                    Logger.log("Pool watcher thread is now sleeping for: #{sleep_time.nil? ? 'forever' : "#{sleep_time} seconds"}")
-                    @@watcher_timer.wait(sleep_time)
+                rescue Timeout::Error => boom
+                    Logger.log("Thread reached maximum execution time (#{@max_exec_time}) processing pool item")
+                rescue Object => boom
+                    Logger.log("Thread encountered error processing pool item: #{boom}")
                 end
-            } if @@pool_thread.nil?
+            end
         end
         
         # Forces sleeping threads to wake up
-        def Pool.wakeup_threads
-            @@watcher_timer.wakeup
-            @@thread_stopper.wakeup
-        end
-        
-        # Returns list of threads currently waiting for an action to process
-        def Pool.waiting_threads
-            waiting = []
-            @@threads.each_pair do |thread,time|
-                waiting << thread if @@thread_stopper.thread_waiting?(thread)
-            end
-            return waiting
+        def Pool.process
+            sleep(0.1)
+            Pool.add_thread if Pool.max_queue_size > 0
+            Logger.log("Current number of threads: #{@@threads.size}")
+            Logger.log("Total number of threads in use system-wide: #{Thread.list.size}")
         end
         
         # Adds a Pool to the master Pool list        
         def Pool.add_pool(pool)
             @@pools << pool
-            @@lock.synchronize do
-                Pool.start_watcher
-            end
         end
         
         # Removes a Pool from the master Pool list
         def Pool.remove_pool(pool)
             @@pools.delete(pool)
-            @@kill = true if @@pools.empty?
+            sleep(0.1)
+            @@threads.each{|t| t.kill} if @@pools.empty?
         end
         
         # Modified Queue to properly interact with Pool
@@ -205,14 +121,14 @@ module ModSpox
             def <<(val)
                 @lock.synchronize do
                     super
-                    Pool.wakeup_threads
+                    Pool.process
                 end
             end
             
             def push(val)
                 @lock.synchronize do
                     super
-                    Pool.wakeup_threads
+                    Pool.process
                 end
             end
             

data/lib/mod_spox/Socket.rb

@@ -1,6 +1,6 @@
 module ModSpox
 
-    class Socket
+    class Socket < Pool
     
         attr_reader :sent
         attr_reader :received
@@ -18,6 +18,7 @@ module ModSpox
         # burst:: Number of lines allowed to be sent within the burst_in time limit
         # Create a new Socket
         def initialize(bot, server, port, delay=2, burst_in=2, burst=4)
+            super()
             @factory = bot.factory
             @pipeline = bot.pipeline
             @server = server
@@ -29,10 +30,11 @@ module ModSpox
             @burst_in = 2
             @kill = false
             @reader_thread = nil
-            @writer_thread = nil
             @time_check = nil
             @check_burst = 0
             @pause = false
+            @sendq = @queue
+            start_pool
         end
         
         # Connects to the IRC server
@@ -43,9 +45,7 @@ module ModSpox
             server = Models::Server.find_or_create(:host => @server, :port => @port)
             server.connected = true
             server.save
-            @sendq = Queue.new
             Logger.log("Created new send queue: #{@sendq}", 10)
-            spooler
             reader
         end
         
@@ -80,12 +80,12 @@ module ModSpox
         # Sends a string to the IRC server
         def write(message)
             return if message.nil?
+            @socket.puts(message + "\n") #send(message + "\n", 0)
             Logger.log("<< #{message}", 5)
-            @socket.send(message + "\n", 0)
             @last_send = Time.new
             @sent += 1
             @check_burst += 1
-            @check_time = Time.now.to_i if @check_time.nil?
+            @time_check = Time.now.to_i if @time_check.nil?
         end
         
         # Retrieves a string from the server
@@ -96,7 +96,7 @@ module ModSpox
         # Retrieves a string from the server
         def read
             message = @socket.gets
-            if(message.nil?)
+            if(message.nil?) # || message =~ /^ERROR/)
                 @pipeline << Messages::Internal::Disconnected.new
                 shutdown
                 server = Models::Server.find_or_create(:host => @server, :port => @port)
@@ -109,60 +109,46 @@ module ModSpox
             message.strip!
             return message
         end
-        
+
         # message:: String to be sent to server
         # Queues a message up to be sent to the IRC server
         def <<(message)
-            queue(message)
-        end
-        
-        # message:: String to be sent to server
-        # Queues a message up to be sent to the IRC server
-        def queue(message)
             @sendq << message
         end
         
         # Starts the thread for sending messages to the server
-        def spooler
-            @writer_thread = Thread.new{
-                until @kill do
-                    write(@sendq.pop)
-                    if((Time.now.to_i - @check_time) > @burst_in)
-                        @check_time = nil
-                        @check_burst = 0
-                    elsif((Time.now.to_i - @check_time) >= @burst_in && @check_burst >= @burst)
-                        sleep(@delay)
-                        @check_time = nil
-                        @check_burst = 0
-                    end
-                end
-            }    
+        def processor
+            write(@sendq.pop)
+            if((Time.now.to_i - @time_check) > @burst_in)
+                @time_check = nil
+                @check_burst = 0
+            elsif((Time.now.to_i - @time_check) >= @burst_in && @check_burst >= @burst)
+                sleep(@delay)
+                @time_check = nil
+                @check_burst = 0
+            end    
         end
         
         # Starts the thread for reading messages from the server
         def reader
-            @reader_thread = Thread.new{
+            @reader_thread = Thread.new do
                 until @kill do
                     Kernel.select([@socket], nil, nil, nil)
                     @factory << read
                 end
-            }
+            end
         end
         
         # restart:: Reconnect after closing connection
         # Closes connection to IRC server
         def shutdown(restart=false)
+            @socket.close unless @socket.closed?
             @kill = true
-            @reader_thread.join(0.1)
-            @reader_thread.kill if @reader_thread.alive?
-            @writer_thread.join(0.1)
-            @writer_thread.kill if @writer_thread.alive?
-            @reader_thread = nil
-            @writer_thread = nil
-            @socket.close
             server = Models::Server.find_or_create(:host => @server, :port => @port)
             server.connected = false
             server.save
+            sleep(0.1)            
+            @reader_thread.kill if @reader_thread.alive?
             connect if restart
         end
         

data/lib/mod_spox/Timer.rb

@@ -31,11 +31,11 @@ module ModSpox
             Logger.log("New block is being added to the timer", 15)
             action = add(message.period, message.once, message.data, &message.block)
             begin
-                @pipeline << Messages::Internal::TimerResponse.new(message.requester, action, true)
+                @pipeline << Messages::Internal::TimerResponse.new(message.requester, action, true, message.id)
                 Logger.log("New block was successfully added to the timer", 15)
             rescue Object => boom
                 Logger.log("Failed to add block to timer: #{boom}", 10)
-                @pipeline << Messages::Internal::TimerResponse.new(message.requester, action, false)
+                @pipeline << Messages::Internal::TimerResponse.new(message.requester, action, false, message.id)
             end
         end
         
@@ -44,7 +44,7 @@ module ModSpox
         def remove_message(message)
             remove(message.action)
             Logger.log("Action has been removed from the Timer", 15)
-            @pipeline << Messages::Internal::TimerResponse.new(nil, message.action, false)
+            @pipeline << Messages::Internal::TimerResponse.new(nil, message.action, false, message.id)
         end
         
         # period:: seconds between running action

data/lib/mod_spox/handlers/Created.rb

@@ -6,7 +6,7 @@ module ModSpox
             end
             def process(string)
                 if(string =~ /#{RPL_CREATED.to_s}.+?:created\s(.+)$/)
-                    return Messages::Incoming::Created(string, $1)
+                    return Messages::Incoming::Created.new(string, $1)
                 else
                     Logger.log('Failed to parse RPL_CREATED message')
                 end

data/lib/mod_spox/handlers/Handler.rb

@@ -10,19 +10,7 @@ module ModSpox
             protected
             
             def find_model(string)
-                if(string =~ /^[A-Za-z\|\\\{\}\[\]\^\`~\_\-]+[A-Za-z0-9\|\\\{\}\[\]\^\`~\_\-]*$/)
-                    Logger.log("Model: #{string} -> Nick")
-                    return Models::Nick.find_or_create(:nick => string)
-                elsif(string =~ /^[&#+!]/)
-                    Logger.log("Model: #{string} -> Channel")
-                    return Models::Channel.find_or_create(:name => string)
-                elsif(model = Models::Server.filter(:host => string, :connected => true).first)
-                    Logger.log("Model: #{string} -> Server")
-                    return model
-                else
-                    Logger.log("FAIL Model: #{string} -> No match")
-                    return string
-                end
+                Helpers.find_model(string)
             end
         
         end

data/lib/mod_spox/handlers/Invite.rb

@@ -9,7 +9,7 @@ module ModSpox
                     source = find_model($1)
                     target = find_model($2)
                     channel = find_model($3)
-                    return Messages::Incoming::Invite(string, source, target, channel)
+                    return Messages::Incoming::Invite.new(string, source, target, channel)
                 else
                     Logger.log('Failed to parse INVITE message')
                 end

data/lib/mod_spox/handlers/LuserOp.rb

@@ -6,7 +6,7 @@ module ModSpox
             end
             def process(string)
                 if(string =~ /(\d+) :.*?\s*[oO]perators/)
-                    return Messages::Incoming::LuserOp(string, $1.to_i)
+                    return Messages::Incoming::LuserOp.new(string, $1.to_i)
                 else
                     Logger.log('Failed to match RPL_LUSEROP message')
                 end

data/lib/mod_spox/handlers/LuserUnknown.rb

@@ -6,7 +6,7 @@ module ModSpox
             end
             def process(string)
                 if(string =~ /(\d+) :.*[Uu]nknown/)
-                    return Messages::Incoming::LuserUnknown(string, $1.to_i)
+                    return Messages::Incoming::LuserUnknown.new(string, $1.to_i)
                 else
                     Logger.log('Failed to match RPL_LUSERUNKNOWN message')
                 end

data/lib/mod_spox/messages/internal/TimerAdd.rb

@@ -10,6 +10,8 @@ module ModSpox
                 attr_reader :period
                 # only execute block once
                 attr_reader :once
+                # message identification
+                attr_reader :ident
                 # period:: interval between executions
                 # once:: only run block once
                 # block:: code block
@@ -20,6 +22,12 @@ module ModSpox
                     @period = period
                     @once = once
                     @block = block
+                    @ident = rand(99999999)
+                end
+                
+                # Message ID
+                def id
+                    @ident
                 end
             end
         end