0
@@ -7,6 +7,11 @@ module Passenger
0
 module AdminTools
0
 
0
 class ControlProcess
0
+	class Instance
0
+		attr_accessor :pid, :socket_name, :socket_type, :sessions, :uptime
0
+		INT_PROPERTIES = [:pid, :sessions]
0
+	end
0
+
0
   attr_accessor :path
0
   attr_accessor :pid
0
   
0
@@ -56,7 +61,7 @@ class ControlProcess
0
     return @domains
0
   end
0
   
0
-	def backends
0
+	def instances
0
     return domains.map do |domain|
0
       domain[:instances]
0
     end.flatten
0
@@ -80,11 +85,17 @@ private
0
         :instances => instances
0
       }
0
       domain.elements.each("instances/instance") do |instance|
0
-				i = {
0
-					:pid => instance.elements["pid"].text.to_i,
0
-					:sessions => instance.elements["sessions"].text.to_i,
0
-					:uptime => instance.elements["uptime"].text
0
-				}
0
+				i = Instance.new
0
+				instance.elements.each do |element|
0
+					if i.respond_to?("#{element.name}=")
0
+						if Instance::INT_PROPERTIES.include?(element.name.to_sym)
0
+							value = element.text.to_i
0
+						else
0
+							value = element.text
0
+						end
0
+						i.send("#{element.name}=", value)
0
+					end
0
+				end
0
         instances << i
0
       end
0
       @domains << d