redis-mmm 0.0.2 → 0.1.0

data/bin/redis_mmm

@@ -73,11 +73,12 @@ class RedisMMM < Thor
     end
 
     def add_ip(ip, interface)
-      ssh("/sbin/ip addr add #{ip} dev #{interface}")
+      $log.debug ssh("ip addr show #{interface} | grep #{ip} || sudo ip addr add #{ip} dev #{interface}")
+
     end
 
     def remove_ip(ip, interface)
-      ssh("/sbin/ip addr del #{ip} dev #{interface}")
+      $log.debug ssh("ip addr show #{interface} | grep #{ip} && sudo ip addr del #{ip} dev #{interface}")
     end
 
     def slaveof(host)
@@ -103,9 +104,9 @@ class RedisMMM < Thor
     end
 
     def ssh(command)
-      cmd = "/usr/bin/ssh -p #{ssh_port} #{ssh_user}@#{address} -c \"sudo #{command}\""
+      cmd = "/usr/bin/ssh -p #{ssh_port} #{ssh_user}@#{address} \"#{command}\""
       $log.debug "Executing #{cmd}"
-      # `#{cmd}`
+      `#{cmd}`
     end
 
   end
@@ -114,6 +115,9 @@ class RedisMMM < Thor
 
   desc "mon", "Start the monitor"
   method_option :config, :default => "/etc/redis-mmm.conf", :required => true, :aliases => "-c"
+  method_option :log, :type => :string
+  method_option :verbose, :type =>:boolean, :aliases => "-v"
+  method_option :pid, :type => :string
   def mon
     init_state
 
@@ -127,6 +131,7 @@ class RedisMMM < Thor
 
   desc "info [HOST]", "Get info about the host"
   method_option :config, :default => "/etc/redis-mmm.conf", :required => true, :aliases => "-c"
+  method_option :verbose, :type =>:boolean, :aliases => "-v"
   def info(name)
     host = self.host(name)
     info = host.state
@@ -145,6 +150,7 @@ class RedisMMM < Thor
 
   desc "status", "Show the current cluster status"
   method_option :config, :default => "/etc/redis-mmm.conf", :required => true, :aliases => "-c"
+  method_option :verbose, :type =>:boolean, :aliases => "-v"
   def status
     puts "Configured hosts"
     hosts.each do |host|
@@ -154,6 +160,7 @@ class RedisMMM < Thor
 
   desc "set_master [HOST]", "Changes the master"
   method_option :config, :default => "/etc/redis-mmm.conf", :required => true, :aliases => "-c"
+  method_option :verbose, :type =>:boolean, :aliases => "-v"
   def set_master(host)
     init_state
     change_master_to(host)
@@ -162,6 +169,22 @@ class RedisMMM < Thor
   protected
 
   def init_state
+    if log = (options.log || config.params['log'])
+      $log = Logger.new(log)
+    end
+
+    $log.level = options.verbose || config.params['verbose'] ? Logger::DEBUG : Logger::INFO
+
+    if pidfile = (options.pid || config.params['pid'])
+      File.open(pidfile, "w") do |f|
+        f.write(Process.pid.to_s)
+      end
+
+      at_exit do
+        FileUtils.rm_f(pidfile)
+      end
+    end
+
     @current_master = find_current_master
     $log.info "current master is #{@current_master}"
   end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Michael Siebert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 +01:00
+date: 2011-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency