sr-scripts 0.1.17 → 0.1.18

data/bin/sr-detect-slaves

@@ -39,15 +39,6 @@ end
 mysql_user = options[:mysql_user]
 mysql_pass = options[:mysql_password]
 
-connection = SrScripts::Compute.get
-
-all_servers = []
-connection.servers.all.each do |server|
-  all_servers.push(server) if server.tags["master_alias"] == options[:master_alias_tag] && server.state == "running"
-end
-
-p "Found #{all_servers.length} Running Servers: " + all_servers.map {|s| s.id}.join(", ")
-
 def print_server (server, padding)
   printf "%#{padding}s: %60s %s\n", server.id, server.created_at, server.dns_name
 end
@@ -63,42 +54,55 @@ def print_all_slaves (server, all_servers, padding)
   end
 end
 
+SrScripts::Compute.get_regions.each do |region|
 
-master_servers = all_servers.find_all { |server| server.tags["master_status"] == "master" }
-p master_servers.length
+  connection = SrScripts::Compute.get(region)
 
-$found_servers = []
+  all_servers = []
+  connection.servers.all.each do |server|
+    all_servers.push(server) if server.tags["master_alias"] == options[:master_alias_tag] && server.state == "running"
+  end
 
-master_servers.each do |master|
-  p "FOUND MASTER: #{master.id}"
-  padding = 10 
-  print_server(master, padding)
-  $found_servers.push master.id
-  print_all_slaves(master, all_servers, padding)
-end
+  p "Found #{all_servers.length} Running Servers: " + all_servers.map {|s| s.id}.join(", ")
 
 
-master_servers = all_servers.find_all { |server| server.tags["master_status"] == "master-retired" }
-p master_servers.length
 
-master_servers.each do |master|
-  p "FOUND RETIRED MASTER: #{master.id}"
-  padding = 10 
-  print_server(master, padding)
-  print_all_slaves(master, all_servers, padding)
-end
+  master_servers = all_servers.find_all { |server| server.tags["master_status"] == "master" }
+  p master_servers.length
 
-all_servers.each do |server|
-  mysql_conn = Mysql.new(server.public_ip_address, mysql_user, mysql_pass)
-  result = mysql_conn.query("SHOW SLAVE STATUS;")
-  result.each_hash do |row|
-    p row
-    p "SECONDS BEHIND: #{row['Seconds_Behind_Master']}"
-    if row['Seconds_Behind_Master'] == nil
-      p "Doesn't have a master"
-    end
+  $found_servers = []
+
+  master_servers.each do |master|
+    p "FOUND MASTER: #{master.id}"
+    padding = 10 
+    print_server(master, padding)
+    $found_servers.push master.id
+    print_all_slaves(master, all_servers, padding)
+  end
+
+
+  master_servers = all_servers.find_all { |server| server.tags["master_status"] == "master-retired" }
+  p master_servers.length
+
+  master_servers.each do |master|
+    p "FOUND RETIRED MASTER: #{master.id}"
+    padding = 10 
+    print_server(master, padding)
+    print_all_slaves(master, all_servers, padding)
   end
 
-  puts "END SERVER: #{server.id}"
+  all_servers.each do |server|
+    mysql_conn = Mysql.new(server.public_ip_address, mysql_user, mysql_pass)
+    result = mysql_conn.query("SHOW SLAVE STATUS;")
+    result.each_hash do |row|
+      p row
+      p "SECONDS BEHIND: #{row['Seconds_Behind_Master']}"
+      if row['Seconds_Behind_Master'] == nil
+        p "Doesn't have a master"
+      end
+    end
+
+    puts "END SERVER: #{server.id}"
 
+  end
 end

data/bin/sr-promote-to-master

@@ -42,7 +42,7 @@ if(options[:current_master_id] == nil || options[:new_master_id] == nil)
 	exit
 end
 
-connection = SrScripts::Compute.get
+connection = SrScripts::Compute.find_connection(options[:current_master_id])
 
 def kill_mysql_connections(db)
 	results = db.query "SHOW PROCESSLIST"

data/lib/sr-scripts/version.rb

@@ -1,5 +1,5 @@
 module Sr
   module Scripts
-    VERSION = "0.1.17"
+    VERSION = "0.1.18"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 17
-  version: 0.1.17
+  - 18
+  version: 0.1.18
 platform: ruby
 authors: 
 - Davy Campano
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-03 00:00:00 -04:00
+date: 2012-04-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency