app/clock.rb @@ -16,9 +16,9 @@ end namespace :db do task :connect do - Memoria.new + Memoria.data_mapper_setup end - + desc "Auto migrate the database" task :migrate => :connect do DataMapper.auto_migrate! Rakefile @@ -1,13 +1,22 @@ -module Memoria +module Memoria class << self - def new(config_path = "memoria.yml") - @config_path = config_path - DataMapper.setup(:default, config[:db]) + def new(start_clock = true, clock_timeout = 30) + data_mapper_setup + Clock.run(clock_timeout) if start_clock Sinatra::Application end - def config - @config ||= YAML.load_file(@config_path)[Sinatra::Application.environment] + def data_mapper_setup + DataMapper.setup(:default, config[:db]) end + + protected + def config + @config ||= YAML.load_file(config_path)[Sinatra::Application.environment] + end + + def config_path + @config_path ||= File.expand_path(File.join(File.dirname(__FILE__), "..", "memoria.yml")) + end end end \ No newline at end of file app/base.rb @@ -10,12 +10,11 @@ class Server include DataMapper::Resource - has n, :snapshots - property :id, Serial property :name, String, :key => true property :host, String property :port, String + has n, :snapshots validates_present :name, :host, :port validates_format :name, :with => /^[0-9a-z]*$/i @@ -48,6 +47,7 @@ class Server else self.snapshots.create :alive => false, :created_at => Time.now end + @stats = nil end def alive? app/models/server.rb @@ -1,12 +1,12 @@ class Snapshot include DataMapper::Resource - belongs_to :server - property :id, Serial - property :alive, Boolean - property :used_memory, Integer - property :total_connections_received, Integer - property :connected_clients, Integer - property :total_commands_processed, Integer - property :created_at, DateTime + property :id, Serial + belongs_to :server + property :alive, Boolean + property :used_memory, Integer + property :total_connections_received, Integer + property :connected_clients, Integer + property :total_commands_processed, Integer + property :created_at, DateTime end \ No newline at end of file app/models/snapshot.rb @@ -2,11 +2,12 @@ require "rubygems" require "sinatra" require "dm-core" require "dm-validations" -require "enumerator" +require "eventmachine" require "redis" $:.unshift "app" require "core_ext" +require "clock" require "base" require "models" require "helpers" memoria.rb @@ -7,7 +7,7 @@ root = File.join(File.dirname(__FILE__), '..') require "#{root}/memoria" -Memoria.new(File.join(File.dirname(__FILE__), '..', 'memoria.yml')) +Memoria.new false DataMapper.auto_migrate! Server.create! :name => "single", :host => "127.0.0.1", :port => "6379" spec/env.rb cbfea45ea07e9c94d80b126d8b23e5021d40e84c Luca Guidi guidi.luca@gmail.com http://github.com/jodosha/memoria/commit/64a91c1ac77369f651fbd9feb7ea993be2950544 64a91c1ac77369f651fbd9feb7ea993be2950544 2009-06-14T14:27:40-07:00 2009-06-14T14:27:40-07:00 Collect statistics in background a6c8361bdaf4147e7573c8402573f37d73e5a805 Luca Guidi guidi.luca@gmail.com