boned 0.2.1 → 0.2.2

data/CHANGES.txt

@@ -1,5 +1,10 @@
 BONED, CHANGES
 
+#### 0.2.2 (2010-01-08) ###############################
+
+* FIXED: Fix for stopping redis
+* CHANGE: Run redis in daemon mode
+
 #### 0.2.1 (2010-01-08) ###############################
 
 * FIXED: Missing config.ru error

data/bin/boned

@@ -45,6 +45,7 @@ class Boned::CLI::Definition
   
   command :start => Boned::CLI
   command :stop => Boned::CLI
+  command :stop_redis => Boned::CLI
   command :info => Boned::CLI
   
 end

data/boned.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "boned"
   s.rubyforge_project = 'boned'
-  s.version = "0.2.1"
+  s.version = "0.2.2"
   s.summary = "The bone daemon"
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -27,6 +27,7 @@
   bin/boned
   boned.gemspec
   config.ru
+  config/redis-server.conf
   lib/boned.rb
   lib/boned/api.rb
   lib/boned/api/debug.rb

data/config/redis-server.conf

@@ -0,0 +1,177 @@
+# Redis configuration file for Boned
+
+# Changes:
+# * port
+# * daemonize
+# * dbfilename
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize yes
+
+# The filename where to dump the DB
+dbfilename /tmp/boned-redis.rdb
+
+# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
+# You can specify a custom pid file location here.
+pidfile /var/run/redis.pid
+
+# Accept connections on the specified port, default is 6379
+port 8045
+
+# If you want you can bind a single interface, if the bind option is not
+# specified all the interfaces will listen for connections.
+#
+# bind 127.0.0.1
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 300
+
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+save 600 1
+save 300 10
+save 60 10000
+
+
+# For default save/load DB in/from the working directory
+# Note that you must specify a directory not a file name.
+dir ./
+
+# Set server verbosity to 'debug'
+# it can be one of:
+# debug (a lot of information, useful for development/testing)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel debug
+
+# Specify the log file name. Also 'stdout' can be used to force
+# the demon to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile stdout
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. Note that the configuration is local to the slave
+# so for example it is possible to configure the slave to save the DB with a
+# different interval, or to listen to another port, and so on.
+
+# slaveof <masterip> <masterport>
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+
+# requirepass 
+
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default there
+# is no limit, and it's up to the number of file descriptors the Redis process
+# is able to open. The special value '0' means no limts.
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+
+# maxclients 128
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys with an
+# EXPIRE set. It will try to start freeing keys that are going to expire
+# in little time and preserve keys with a longer time to live.
+# Redis will also try to remove objects from free lists if possible.
+#
+# If all this fails, Redis will start to reply with errors to commands
+# that will use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to most read-only commands like GET.
+#
+# WARNING: maxmemory can be a good idea mainly if you want to use Redis as a
+# 'state' server or cache, not as a real DB. When Redis is used as a real
+# database the memory usage will grow over the weeks, it will be obvious if
+# it is going to use too much memory in the long run, and you'll have the time
+# to upgrade. With maxmemory after the limit is reached you'll start to get
+# errors for write operations, and this may even lead to DB inconsistency.
+
+# maxmemory <bytes>
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. If you can live
+# with the idea that the latest records will be lost if something like a crash
+# happens this is the preferred way to run Redis. If instead you care a lot
+# about your data and don't want to that a single record can get lost you should
+# enable the append only mode: when this mode is enabled Redis will append
+# every write operation received in the file appendonly.log. This file will
+# be read on startup in order to rebuild the full dataset in memory.
+#
+# Note that you can have both the async dumps and the append only file if you
+# like (you have to comment the "save" statements above to disable the dumps).
+# Still if append only mode is enabled Redis will load the data from the
+# log file at startup ignoring the dump.rdb file.
+#
+# The name of the append only file is "appendonly.log"
+
+appendonly no
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead to wait for more data in the output buffer. Some OS will really flush 
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log . Slow, Safest.
+# everysec: fsync only if one second passed since the last fsync. Compromise.
+#
+# The default is "always" that's the safer of the options. It's up to you to
+# understand if you can relax this to "everysec" that will fsync every second
+# or to "no" that will let the operating system flush the output buffer when
+# it want, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting).
+
+appendfsync always
+# appendfsync everysec
+# appendfsync no
+
+############################### ADVANCED CONFIG ###############################
+
+# Glue small output buffers together in order to send small replies in a
+# single TCP packet. Uses a bit more CPU but most of the times it is a win
+# in terms of number of queries per second. Use 'yes' if unsure.
+glueoutputbuf yes
+
+# Use object sharing. Can save a lot of memory if you have many common
+# string in your dataset, but performs lookups against the shared objects
+# pool so it uses more CPU and can be a bit slower. Usually it's a good
+# idea.
+#
+# When object sharing is enabled (shareobjects yes) you can use
+# shareobjectspoolsize to control the size of the pool used in order to try
+# object sharing. A bigger pool size will lead to better sharing capabilities.
+# In general you want this value to be at least the double of the number of
+# very common strings you have in your dataset.
+#
+# WARNING: object sharing is experimental, don't enable this feature
+# in production before of Redis 1.0-stable. Still please try this feature in
+# your development environment so that we can test it better.
+shareobjects no
+shareobjectspoolsize 1024

data/lib/boned/cli.rb

@@ -4,11 +4,9 @@ require 'pp'
 class Boned::CLI < Drydock::Command
   attr_accessor :exit_code
   
-  def init
-    Boned.connect
-  end
   
   def start
+    Boned.connect
     if Boned.service_available?('127.0.0.1', server_opts[:port])
       raise Boned::Server::ServerRunning, server_opts[:port]
     end
@@ -16,13 +14,19 @@ class Boned::CLI < Drydock::Command
   end
   
   def stop
-    Boned.stop_redis
+    Boned.connect(false)
+    Boned.stop_redis 
     if not Boned.service_available?('127.0.0.1', server_opts[:port])
       raise Boned::Server::ServerNotRunning, server_opts[:port]
     end
     Boned::Controllers::Controller.new(server_opts).stop 
   end
   
+  def stop_redis
+    Boned.connect(false)
+    Boned.stop_redis
+  end
+  
   def info
     require 'yaml'
     if Boned.service_available?('127.0.0.1', server_opts[:port])

data/lib/boned/models/bone.rb

@@ -102,7 +102,6 @@ class Bone < Boned::Model
       clean = []
       dirty.each { |k| 
         next if k.match(/prop\z/); 
-        p k
         clean << k.split(':')[4..-1].join(':') 
       }
       clean

data/lib/boned.rb

@@ -23,7 +23,7 @@ module Boned
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
     PATCH = '001'
     def self.inspect; [to_s, PATCH].join('.'); end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
@@ -55,15 +55,18 @@ module Boned
   end
     
   # Connect to Redis and Mongo. 
-  def self.connect
+  def self.connect(start_redis=true)
     update_redis_client_config
-    start_redis unless redis_available?
-    abort "No Redis" unless redis_available?
+    ld "CONNECT: start_redis(#{start_redis})"
+    if start_redis 
+      self.start_redis
+      abort "No Redis" unless redis_available?
+    end
     @redis = Redis.new @conf[:redis]
   end
   
   def self.start_redis
-    return Problem, "Redis already running" if redis_available? 
+    return if redis_available? 
     conf_path = File.join(BONED_HOME, 'config', 'redis-server.conf')
     ld "REDIS SERVER CONF: #{conf_path}"
     @redis_thread = Thread.new do
@@ -73,10 +76,11 @@ module Boned
   end
   
   def self.stop_redis
-    ld "SHUTDOWN REDIS"
-    @redis.shutdown if redis_available? 
+    ld "SHUTDOWN REDIS #{redis_available?}"
+    ld @redis.inspect
+    # Shutdown command returns "-ERR operation not permitted" ??
+    @redis.shutdown if !@redis.nil?  && redis_available? rescue nil
     return if @redis_thread.nil? || !@redis_thread.alive?
-    @redis_thread.join
   end
   
   # <tt>require</tt> a library from the vendor directory.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: boned
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -33,6 +33,7 @@ files:
 - bin/boned
 - boned.gemspec
 - config.ru
+- config/redis-server.conf
 - lib/boned.rb
 - lib/boned/api.rb
 - lib/boned/api/debug.rb