automate-em 0.0.2 → 0.0.3

data/app/controllers/tokens_controller.rb

@@ -85,7 +85,7 @@ class TokensController < ActionController::Base
 
 
 	def servers
-		render :json => Server.all
+		render :json => Server.where(:online => true).all
 	end
 
 

data/app/models/dependency.rb

@@ -14,7 +14,7 @@ class Dependency < ActiveRecord::Base
 	protected
 	
 	
-	validates_presence_of :classname, :filename, :module_name, :actual_name
-	validates_uniqueness_of :filename
+	validates_presence_of :classname, :module_name, :actual_name
+	validates_uniqueness_of :classname
 	validates_uniqueness_of :actual_name
 end

data/lib/automate-em/core/communicator.rb

@@ -56,10 +56,8 @@ class Communicator
 		
 		if user.class == User
 			user.control_systems.select('control_systems.id, control_systems.name').each do |controller|
-				if !!System[controller.name.to_sym]
-					response[:ids] << controller.id
-					response[:names] << controller.name
-				end
+				response[:ids] << controller.id
+				response[:names] << controller.name
 			end 	# We ignore token requests here as they should know the system they can connect to
 		end
 		return response
@@ -77,11 +75,11 @@ class Communicator
 		else
 			sys = nil
 			
-			if user.class == User
-				sys = user.control_systems.select('control_systems.name').where('control_systems.id = ? AND control_systems.active = ?', system.to_i, true).first
+			if user.is_a? User
+				sys = user.control_systems.select('control_systems.id').where('control_systems.id = ? AND control_systems.active = ?', system.to_i, true).first
 				
-			elsif user.class == TrustedDevice && user.control_system_id == system.to_i
-				sys = User.find(user.user_id).control_systems.select('control_systems.name, control_systems.active').where('control_systems.id = ?', system.to_i).first
+			elsif user.is_a?(TrustedDevice) && user.control_system_id == system.to_i
+				sys = User.find(user.user_id).control_systems.select('control_systems.id, control_systems.active').where('control_systems.id = ?', system.to_i).first
 				if sys.nil?
 					#
 					# Kill comms, this key is not valid
@@ -99,7 +97,7 @@ class Communicator
 				end
 			end
 			
-			system = sys.nil? ? nil : sys.name.to_sym
+			system = sys.nil? ? nil : sys.id
 			if System[system].nil?
 				interface.shutdown	#kill comms
 				return nil
@@ -278,7 +276,11 @@ class Communicator
 		
 		begin
 			@command_lock.synchronize {
-				@system.modules[mod].instance.public_send(command, *args)	# Not send string however call function command
+				if @system != System
+					@system.modules[mod].instance.public_send(command, *args)	# Not send string however call function command
+				else
+					@system.public_send(command, *args)
+				end
 			}
 		rescue => e
 			AutomateEm.print_error(logger, e, {

data/lib/automate-em/core/modules.rb

@@ -1,42 +1,50 @@
 module AutomateEm
 	class Modules
 		@@modules = {}	# modules (dependency_id => module class)
-		@@load_lock = Object.new.extend(MonitorMixin) #Mutex.new
-		@@loading = nil
+		@@load_lock = Mutex.new
 	
 		def self.[] (dep_id)
-			@@load_lock.mon_synchronize {
+			@@load_lock.synchronize {
 				@@modules[dep_id]
 			}
 		end
+		
+		def self.lazy_load(dep)
+			theClass = Modules[dep.id]
+			theClass = Modules.load_module(dep) if theClass.nil?
+			theClass
+		end
 	
 		def self.load_module(dep)
-			@@load_lock.mon_synchronize {
-				begin
-					found = false
-					file = "#{dep.classname.underscore}.rb"
-					
-					Rails.configuration.automate.module_paths.each do |path|
-						if File.exists?("#{path}/#{file}")
+			begin
+				found = false
+				file = "#{dep.classname.underscore}.rb"
+				
+				Rails.configuration.automate.module_paths.each do |path|
+					if File.exists?("#{path}/#{file}")
+						@@load_lock.synchronize {
 							load "#{path}/#{file}"
-							found = true
-							break
-						end
+						}
+						found = true
+						break
 					end
-					
-					if not found
-						raise "File not found! (#{file})"
-					end
-					
-					@@modules[dep.id] = dep.classname.constantize
-				rescue => e
-					AutomateEm.print_error(System.logger, e, {
-						:message => "device module #{dep.actual_name} error whilst loading",
-						:level => Logger::ERROR
-					})
 				end
-			
-			}
+				
+				if not found
+					raise "File not found! (#{file})"
+				end
+				
+				@@load_lock.synchronize {
+					@@modules[dep.id] = dep.classname.constantize	# this is the return value
+				}
+			rescue Exception => e
+				AutomateEm.print_error(System.logger, e, {
+					:message => "device module #{dep.actual_name} error whilst loading.",
+					:level => Logger::ERROR
+				})
+				
+				return false
+			end
 		end
 	end
 
@@ -51,7 +59,7 @@ module AutomateEm
 		@@lookup = {}		# @instance => db id array
 		@@lookup_lock = Mutex.new
 		
-		def initialize(system, controllerDevice)
+		def initialize(system, controllerDevice, theModule)
 			@@lookup_lock.synchronize {
 				if @@instances[controllerDevice.id].nil?
 					@system = system
@@ -59,7 +67,7 @@ module AutomateEm
 					@@dbentry[controllerDevice.id] = controllerDevice
 				end
 			}
-			instantiate_module(controllerDevice)
+			instantiate_module(controllerDevice, theModule)
 		end
 		
 		
@@ -103,12 +111,7 @@ module AutomateEm
 		protected
 	
 	
-		def instantiate_module(controllerDevice)
-			if Modules[controllerDevice.dependency_id].nil?
-				Modules.load_module(controllerDevice.dependency)		# This is the re-load code function (live bug fixing - removing functions does not work)
-			end
-			
-			
+		def instantiate_module(controllerDevice, theModule)
 			baselookup = "#{controllerDevice.ip}:#{controllerDevice.port}:#{controllerDevice.udp}"
 			
 			@@lookup_lock.lock
@@ -118,7 +121,7 @@ module AutomateEm
 				# Instance of a user module
 				#
 				begin
-					@instance = Modules[controllerDevice.dependency_id].new(controllerDevice.tls, controllerDevice.makebreak)
+					@instance = theModule.new(controllerDevice.tls, controllerDevice.makebreak)
 					@instance.join_system(@system)
 					@@instances[@device] = @instance
 					@@devices[baselookup] = @instance
@@ -145,9 +148,9 @@ module AutomateEm
 						end
 						
 						if controllerDevice.udp
-							
-							devBase.call_connected	# UDP is stateless (always connected)
-						
+							EM.schedule do
+								devBase.call_connected	# UDP is stateless (always connected)
+							end
 						end
 					end
 				}
@@ -205,7 +208,7 @@ module AutomateEm
 		@@lookup = {}		# @instance => db id array
 		@@lookup_lock = Mutex.new
 		
-		def initialize(system, controllerService)
+		def initialize(system, controllerService, theModule)
 			@@lookup_lock.synchronize {
 				if @@instances[controllerService.id].nil?
 					@system = system
@@ -213,7 +216,7 @@ module AutomateEm
 					@@dbentry[controllerService.id] = controllerService
 				end
 			}
-			instantiate_module(controllerService)
+			instantiate_module(controllerService, theModule)
 		end
 		
 		
@@ -253,23 +256,21 @@ module AutomateEm
 		protected
 	
 	
-		def instantiate_module(controllerService)
-			if Modules[controllerService.dependency_id].nil?
-				Modules.load_module(controllerService.dependency)		# This is the re-load code function (live bug fixing - removing functions does not work)
-			end
-			
+		def instantiate_module(controllerService, theModule)			
 			@@lookup_lock.lock
 			if @@services[controllerService.uri].nil?
-				
-				#
-				# Instance of a user module
-				#
-				@instance = Modules[controllerService.dependency_id].new
-				@instance.join_system(@system)
-				@@instances[@service] = @instance
-				@@services[controllerService.uri] = @instance
-				@@lookup[@instance] = [@service]
-				@@lookup_lock.unlock #UNLOCK
+				begin
+					#
+					# Instance of a user module
+					#
+					@instance = theModule.new
+					@instance.join_system(@system)
+					@@instances[@service] = @instance
+					@@services[controllerService.uri] = @instance
+					@@lookup[@instance] = [@service]
+				ensure
+					@@lookup_lock.unlock #UNLOCK
+				end
 				
 				HttpService.new(@instance, controllerService)
 				
@@ -308,10 +309,10 @@ module AutomateEm
 		@@lookup_lock = Mutex.new
 		
 
-		def initialize(system, controllerLogic)
+		def initialize(system, controllerLogic, theModule)
 			@@lookup_lock.synchronize {
 				if @@instances[controllerLogic.id].nil?
-					instantiate_module(controllerLogic, system)
+					instantiate_module(controllerLogic, system, theModule)
 				end
 			}
 			if @instance.respond_to?(:on_load)
@@ -368,11 +369,8 @@ module AutomateEm
 		protected
 
 
-		def instantiate_module(controllerLogic, system)
-			if Modules[controllerLogic.dependency_id].nil?
-				Modules.load_module(controllerLogic.dependency)		# This is the re-load code function (live bug fixing - removing functions does not work)
-			end
-			@instance = Modules[controllerLogic.dependency_id].new(system)
+		def instantiate_module(controllerLogic, system, theModule)
+			@instance = theModule.new(system)
 			@@instances[controllerLogic.id] = @instance
 			@@lookup[@instance] = controllerLogic
 		end

data/lib/automate-em/core/system.rb

@@ -1,78 +1,144 @@
 module AutomateEm
 	class System
-
-		@@systems = {:'---GOD---' => self}		# system_name => system instance
-		@@controllers = {}						# controller_id => system instance
+		@@controllers = {0 => self}						# controller_id => system instance	(0 is the system class)
 		@@logger = nil
-		@@communicator = AutomateEm::Communicator.new(self)
+		@@communicator = AutomateEm::Communicator.new(self)	# TODO:: remove the need for communicator.start
 		@@communicator.start(true)
 		@@god_lock = Mutex.new
 		
 		
-		def self.new_system(controller, log_level = Logger::INFO)
+		
+		#
+		# Error thrown means: mark as offline, do not retry and email
+		# Return false means: retry and email if a second attempt fails
+		# Return true means: all is good! system running
+		#
+		def self.start(controller, log_level = Logger::INFO)
 			begin
-				if controller.class == Fixnum
+				
+				#
+				# Ensure we are dealing with a controller
+				#
+				if controller.is_a? Fixnum
 					controller = ControlSystem.find(controller)
-				elsif controller.class == String
+				elsif controller.is_a? String
 					controller = ControlSystem.where('name = ?', controller).first
 				end
 				
-				if controller.class != ControlSystem
+				if not controller.is_a? ControlSystem
 					raise 'invalid controller identifier'
 				end
-			
-				@@god_lock.lock
-				if @@controllers[controller.id].nil?
-					@@god_lock.unlock
-					sys = System.new(controller, log_level)
-					if controller.active
-						begin
-							sys.start(true)			# as this is loading the first time we ignore controller active
-						rescue => e
-							AutomateEm.print_error(@@logger, e, {
-								:message => "Error starting system in new_system, stopping..",
-								:level => Logger::ERROR
-							})
-							begin
-								sys.stop
-								EM.schedule do
-									EM.add_timer(60) do # Attempt a single restart
-										EM.defer do
-											begin
-												sys.start(true)
-											rescue => e
-												begin
-													AutomateEm.print_error(@@logger, e, {
-														:message => "Second start attempt failed..",
-														:level => Logger::ERROR
-													})
-													sys.stop
-												rescue
-												end
-											end
-										end
-									end
-								end
-							rescue => e
-								AutomateEm.print_error(@@logger, e, {
-									:message => "Error stopping system after problems starting..",
-									:level => Logger::ERROR
-								})
-							end
+				
+				
+				#
+				# Check if the system is already loaded or loading
+				#
+				@@god_lock.synchronize {
+					if @@controllers[controller.id].present?
+						return true
+					end
+					
+					begin
+						controller.reload(:lock => true)
+						if controller.active
+							return true
+						else
+							controller.active = true
 						end
+					ensure
+						controller.save
+					end
+				}
+				
+				#
+				# Create the system
+				#
+				system = System.new(controller, log_level)
+				
+				#
+				# Load modules here (Producer)
+				#
+				proceed = Atomic.new(true)
+				queue = Queue.new
+				producer = Thread.new do	# New thread here to prevent circular waits on the thread pool
+					begin
+						controller.devices.includes(:dependency).each do |device|
+							theClass = Modules.lazy_load(device.dependency)
+							raise "Load Error" if theClass == false
+							queue.push([device, theClass])
+						end
+						
+						controller.services.includes(:dependency).each do |service|
+							theClass = Modules.lazy_load(service.dependency)
+							raise "Load Error" if theClass == false
+							queue.push([service, theClass])
+						end
+						
+						controller.logics.includes(:dependency).each do |logic|
+							theClass = Modules.lazy_load(logic.dependency)
+							raise "Load Error" if theClass == false
+							queue.push([logic, theClass])
+						end
+					rescue
+						proceed.value = false
+					ensure
+						ActiveRecord::Base.clear_active_connections!	# Clear any unused connections
+						queue.push(:done)
 					end
-				else
-					@@god_lock.unlock
 				end
+				
+				#
+				# Consume the newly loaded modules here (Consumer)
+				#
+				mod = queue.pop
+				while mod.is_a?(Array) && proceed.value == true
+					begin
+						system.load(*mod)
+						
+						mod = queue.pop
+					rescue => e
+						AutomateEm.print_error(@@logger, e, {
+							:message => "Error stopping system after problems starting..",
+							:level => Logger::ERROR
+						})
+						
+						proceed.value = false
+					end
+				end
+				
+				
+				#
+				# Check if system modules loaded properly
+				#
+				if proceed.value == false
+					#
+					# Unload any loaded modules
+					#
+					system.stop
+					
+					return false
+				end
+				
+				
+				#
+				# Setup the systems link
+				#
+				system.start	# Start the systems communicator
+				return true
 			ensure
 				ActiveRecord::Base.clear_active_connections!	# Clear any unused connections
 			end
 		end
 		
 		
+		def self.stop(system)
+			System[system].stop
+		end
+		
+		
 		#
 		# Reloads a dependency live
-		#	This is the re-load code function (live bug fixing - removing functions does not work)
+		#	This is the re-load code function (live bug fixing - removing / adding / modifying functions)
 		#
 		def self.reload(dep)
 			System.logger.info "reloading dependency: #{dep}"
@@ -90,6 +156,16 @@ module AutomateEm
 				end
 			end
 			
+			updated = {}
+			dep.services.select('id').each do |ser|
+				begin
+					inst = ServiceModule.instance_of(ser.id)
+					inst.on_update if (!!!updated[inst]) && inst.respond_to?(:on_update)
+				ensure
+					updated[inst] = true
+				end
+			end
+			
 			updated = {}
 			dep.logics.select('id').each do |log|
 				begin
@@ -109,6 +185,11 @@ module AutomateEm
 		#
 		def self.force_load_file(path)
 			load path if File.exists?(path) && File.extname(path) == '.rb'
+		rescue LoadError => e	# load error explicitly handled
+			AutomateEm.print_error(System.logger, e, {
+				:message => "force load of #{path} failed",
+				:level => Logger::ERROR
+			})
 		end
 		
 		
@@ -123,36 +204,30 @@ module AutomateEm
 			@@logger = log
 		end
 		
-		#def self.controllers
-		#	@@controllers
-		#end
-	
-		#def self.systems
-		#	@@systems
-		#end
-		
 		def self.communicator
 			@@communicator
 		end
 		
 		def self.[] (system)
-			system = system.to_sym if system.class == String
+			if system.is_a?(Symbol) || system.is_a?(String)
+				id = ControlSystem.where('name = ?', system.to_s).pluck(:id).first
+				if id.nil? && system.is_a?(String)
+					system = system.to_i
+				else
+					system = id
+				end
+			end
+			
 			@@god_lock.synchronize {
-				@@systems[system]
+				@@controllers[system]
 			}
 		end
 		
 		
 		
 		#
-		# For access via communicator as a super user
+		# For access via communicator
 		#
-		def self.modules
-			self
-		end
-		def self.instance
-			self
-		end
 		def instance
 			self
 		end
@@ -174,49 +249,27 @@ module AutomateEm
 		attr_accessor :logger
 		
 		
+		#
+		# Loads a module into a system
+		#
+		def load(dbSetting, theClass)
+			if dbSetting.is_a?(ControllerDevice)
+				load_hooks(dbSetting, DeviceModule.new(self, dbSetting, theClass))
+			elsif dbSetting.is_a?(ControllerHttpService)
+				load_hooks(dbSetting, ServiceModule.new(self, dbSetting, theClass))
+			else # ControllerLogic
+				load_hooks(dbSetting, LogicModule.new(self, dbSetting, theClass))
+			end
+		end
 		
 		#
-		# Starts the control system if not running
+		# The system is ready to go
 		#
-		def start(force = false)
-			System.logger.info "starting #{@controller.name}"
-			@sys_lock.synchronize {
-				@@god_lock.synchronize {
-					@@systems.delete(@controller.name.to_sym)
-					@controller.reload #(:lock => true)
-					@@systems[@controller.name.to_sym] = self
-				}
-				
-				if !@controller.active || force
-					if @logger.nil?
-						if Rails.env.production?
-							@logger = Logger.new(Rails.root.join("log/system_#{@controller.id}.log").to_s, 10, 4194304)
-						else
-							@logger = Logger.new(STDOUT)
-						end
-						@logger.formatter = proc { |severity, datetime, progname, msg|
-							"#{datetime.strftime("%d/%m/%Y @ %I:%M%p")} #{severity}: #{@controller.name} - #{msg}\n"
-						}
-					end
-					
-					@controller.devices.includes(:dependency).each do |device|
-						load_hooks(device, DeviceModule.new(self, device))
-					end
-					
-					@controller.services.includes(:dependency).each do |service|
-						load_hooks(service, ServiceModule.new(self, service))
-					end
-				
-					@controller.logics.includes(:dependency).each do |logic|
-						load_hooks(logic, LogicModule.new(self, logic))
-					end
-				end
-				
-				@controller.active = true
-				@controller.save
-				
-				@communicator.start
+		def start
+			@@god_lock.synchronize {
+				@@controllers[@controller.id] = self
 			}
+			@communicator.start
 		end
 		
 		#
@@ -226,29 +279,31 @@ module AutomateEm
 		def stop
 			System.logger.info "stopping #{@controller.name}"
 			@sys_lock.synchronize {
-				stop_nolock
-			}
-		end
-		
-		#
-		# Unload and then destroy self
-		#
-		def delete
-			System.logger.info "deleting #{@controller.name}"
-			@sys_lock.synchronize {
-				stop_nolock
+				if @controller.active
+					@communicator.shutdown
+					modules_unloaded = {}
+					@modules.each_value do |mod|
+						
+						if modules_unloaded[mod] == nil
+							modules_unloaded[mod] = :unloaded
+							mod.unload
+						end
+						
+					end
+					@modules = {}	# Modules no longer referenced. Cleanup time!
+					@logger.close if Rails.env.production?
+					@logger = nil
+				end
 				
 				@@god_lock.synchronize {
-					@@systems.delete(@controller.name.to_sym)
 					@@controllers.delete(@controller.id)
+					begin
+						@controller.reload(:lock => true)
+						@controller.active = false
+					ensure
+						@controller.save
+					end
 				}
-				
-				begin
-					@controller.destroy!
-				rescue
-					# Controller may already be deleted
-				end
-				@modules = nil
 			}
 		end
 		
@@ -267,43 +322,6 @@ module AutomateEm
 		
 	
 		protected
-		
-		
-		def stop_nolock
-			
-			begin
-				@@god_lock.synchronize {
-					@@systems.delete(@controller.name.to_sym)
-					@controller.reload(:lock => true)
-					@@systems[@controller.name.to_sym] = self
-				}
-			rescue
-				# Assume controller may have been deleted
-			end
-			
-			if @controller.active
-				@communicator.shutdown
-				modules_unloaded = {}
-				@modules.each_value do |mod|
-					
-					if modules_unloaded[mod] == nil
-						modules_unloaded[mod] = :unloaded
-						mod.unload
-					end
-					
-				end
-				@modules = {}	# Modules no longer referenced. Cleanup time!
-				@logger.close if Rails.env.production?
-				@logger = nil
-			end
-			
-			@controller.active = false
-			begin
-				@controller.save
-			rescue
-				# Assume controller may have been deleted
-			end
-		end
 	
 	
 		def load_hooks(device, mod)
@@ -315,27 +333,29 @@ module AutomateEm
 			#	The first module of a type has two names (display and display_1 for example)
 			#	Load order is controlled by the control_system model based on the ordinal
 			#
-			if not @modules[module_name.to_sym].nil?
-				while @modules["#{module_name}_#{count}".to_sym].present?
-					count += 1
+			@sys_lock.synchronize {
+				if not @modules[module_name.to_sym].nil?
+					while @modules["#{module_name}_#{count}".to_sym].present?
+						count += 1
+					end
+					module_name = "#{module_name}_#{count}"
+				else
+					@modules["#{module_name}_1".to_sym] = mod
 				end
-				module_name = "#{module_name}_#{count}"
-			else
-				@modules["#{module_name}_1".to_sym] = mod
-			end
-			@modules[module_name.to_sym] = mod
-			
-			#
-			# Allow for system specific custom names
-			#
-			if !device.custom_name.nil?
-				@modules[device.custom_name.to_sym] = mod
-			end
+				@modules[module_name.to_sym] = mod
+				
+				#
+				# Allow for system specific custom names
+				#
+				if !device.custom_name.nil?
+					@modules[device.custom_name.to_sym] = mod
+				end
+			}
 		end
 		
 		
 		def initialize(controller, log_level)
-			
+			System.logger.info "starting #{controller.name}"
 			
 			@modules = {}	# controller modules	:name => module instance (device or logic)
 			@communicator = AutomateEm::Communicator.new(self)
@@ -344,12 +364,13 @@ module AutomateEm
 			@sys_lock = Mutex.new
 			
 			
-			#
-			# Setup the systems links
-			#
-			@@god_lock.synchronize {
-				@@systems[@controller.name.to_sym] = self	# it may not be started
-				@@controllers[@controller.id] = self
+			if Rails.env.production?
+				@logger = Logger.new(Rails.root.join("log/system_#{@controller.id}.log").to_s, 10, 4194304)
+			else
+				@logger = Logger.new(STDOUT)
+			end
+			@logger.formatter = proc { |severity, datetime, progname, msg|
+				"#{datetime.strftime("%d/%m/%Y @ %I:%M%p")} #{severity}: #{@controller.name} - #{msg}\n"
 			}
 		end
 	end

data/lib/automate-em/device/device.rb

@@ -1,85 +1,4 @@
 module AutomateEm
-	module ModuleCore
-		include Status	# The observable pattern (Should not be called directly)
-		include Constants
-		include Utilities
-		
-		#
-		# Sets up a link for the user code to the eventmachine class
-		#	This way the namespace is clean.
-		#
-		def setbase(base)
-			@base = base
-		end
-		
-		
-		def join_system(system)
-			@system_lock.synchronize {
-				@systems << system
-			}
-		end
-		
-		def leave_system(system)
-			@system_lock.synchronize {
-				@systems.delete(system)
-				return @systems.length
-			}
-		end
-		
-		def clear_active_timers
-			@schedule.clear_jobs unless @schedule.nil?
-		end
-		
-		
-		#def command_successful(result)			# TODO:: needs a re-think
-		#	@base.process_data_result(result)
-		#end
-		
-
-		def logger
-			@system_lock.synchronize {
-				return @systems[0].logger unless @systems.empty?
-			}
-			System.logger
-		end
-		
-		attr_reader :systems
-		attr_reader :base
-		
-		
-		protected
-		
-		
-		#
-		# Configuration and settings
-		# => TODO:: We should get all zones that the pod is in with the setting set and select the first setting (vs first zone)
-		#		
-		def setting(name)
-			val = config.settings.where("name = ?", name.to_s).first
-			if val.nil?
-				val = config.control_system.zones.joins(:settings).where('settings.name = ?', name.to_s).first
-				val = val.settings.where("name = ?", name.to_s).first unless val.nil?
-				
-				val = config.dependency.settings.where("name = ?", name.to_s).first if val.nil?
-			end
-			
-			if val.present?
-				case val.value_type
-					when 0
-						return val.text_value
-					when 1
-						return val.integer_value
-					when 2
-						return val.float_value
-					when 3
-						return val.datetime_value
-				end
-			end
-			
-			return nil
-		end
-	end
-	
 	class Device
 		include ModuleCore
 		
@@ -93,7 +12,7 @@ module AutomateEm
 			@secure_connection = tls
 			@makebreak_connection = makebreak
 			@status = {}
-			@status_lock = Mutex.new
+			@status_lock = Object.new.extend(MonitorMixin)
 			@system_lock = Mutex.new
 			@status_waiting = false
 		end

data/lib/automate-em/device/device_connection.rb

@@ -28,7 +28,10 @@ module AutomateEm
 				:max_buffer => 524288,		# 512kb
 				:clear_queue_on_disconnect => false,
 				:flush_buffer_on_disconnect => false,
-				:priority_bonus => 20
+				:priority_bonus => 20,
+				:inactivity_timeout => 0	# part of make and break options
+				# :response_length			# an alternative to response_delimiter (lower priority)
+				# :response_delimiter		# here instead of a function call
 			}
 			
 			
@@ -251,10 +254,10 @@ module AutomateEm
 		def do_receive_data(data)
 			@last_recieve_at = Time.now.to_f
 			
-			if @parent.respond_to?(:response_delimiter)
-				begin
+			begin
+				if @config[:response_delimiter].present?
 					if @buf.nil?
-						del = @parent.response_delimiter
+						del = @config[:response_delimiter]
 						if del.class == Array
 							del = array_to_str(del)
 						elsif del.class == Fixnum
@@ -263,17 +266,26 @@ module AutomateEm
 						@buf = BufferedTokenizer.new(del, @config[:max_buffer])    # Call back for character
 					end
 					data = @buf.extract(data)
-				rescue => e
-					@buf = nil	# clear the buffer
-					EM.defer do # Error in a thread
-						AutomateEm.print_error(logger, e, {
-							:message => "module #{@parent.class} error whilst setting delimiter",
-							:level => Logger::ERROR
-						})
+				elsif @config[:response_length].present?
+					(@buf ||= "") << data
+					data = @buf.scan(/.{1,#{@config[:response_length]}}/)
+					if data[-1].length == @config[:response_length]
+						@buf = nil
+					else
+						@buf = data[-1]
+						data = data[0..-2]
 					end
+				else
 					data = [data]
 				end
-			else
+			rescue => e
+				@buf = nil	# clear the buffer
+				EM.defer do # Error in a thread
+					AutomateEm.print_error(logger, e, {
+						:message => "module #{@parent.class} error whilst setting delimiter",
+						:level => Logger::ERROR
+					})
+				end
 				data = [data]
 			end
 			
@@ -297,7 +309,7 @@ module AutomateEm
 		
 		
 		#
-		# Caled from recieve
+		# Called from receive
 		#
 		def process_response(response, command)
 			EM.defer do
@@ -438,7 +450,7 @@ module AutomateEm
 		end
 		
 		def process_response_complete
-			if (@make_break && @send_queue.empty?) || @command[:force_disconnect]
+			if (@make_break && @config[:inactivity_timeout] == 0 && @send_queue.empty?) || @command[:force_disconnect]
 				if @connected
 					close_connection_after_writing
 					@disconnecting = true
@@ -483,7 +495,7 @@ module AutomateEm
 				#
 				# Make sure we are sending appropriately formatted data
 				#
-				if data.class == Array
+				if data.is_a?(Array)
 					data = array_to_str(data)
 				elsif options[:hex_string] == true
 					data = hex_to_byte(data)
@@ -591,42 +603,45 @@ module AutomateEm
 		#
 		# Connection state
 		#
-		def call_connected(*args)		# Called from a deferred thread
+		def call_connected(*args)
 			#
 			# NOTE:: Same as add parent in device module!!!
 			#	TODO:: Should break into a module and include it
 			#
+			set_comm_inactivity_timeout(@config[:inactivity_timeout])
 			@task_queue.push lambda {
-				@parent[:connected] = true
-				
-				begin
-					@send_monitor.mon_synchronize { # Any sends in here are high priority (no emits as this function must return)
-						@parent.connected(*args) if @parent.respond_to?(:connected)
-					}
-				rescue => e
-					#
-					# save from bad user code (don't want to deplete thread pool)
-					#
-					AutomateEm.print_error(logger, e, {
-						:message => "module #{@parent.class} error whilst calling: connect",
-						:level => Logger::ERROR
-					})
-				ensure
-					EM.schedule do
+				EM.defer do
+					@parent[:connected] = true
+					
+					begin
+						@send_monitor.mon_synchronize { # Any sends in here are high priority (no emits as this function must return)
+							@parent.connected(*args) if @parent.respond_to?(:connected)
+						}
+					rescue => e
 						#
-						# First connect if no commands pushed then we disconnect asap
+						# save from bad user code (don't want to deplete thread pool)
 						#
-						if @make_break && @first_connect && @send_queue.size == 0
-							close_connection_after_writing
-							@disconnecting = true
-							@com_paused = true
-							@first_connect = false
-						elsif @com_paused
-							@com_paused = false
-							@wait_queue.push(nil)
-						else
-							EM.defer do
-								logger.info "Reconnected, communications not paused."
+						AutomateEm.print_error(logger, e, {
+							:message => "module #{@parent.class} error whilst calling: connect",
+							:level => Logger::ERROR
+						})
+					ensure
+						EM.schedule do
+							#
+							# First connect if no commands pushed then we disconnect asap
+							#
+							if @make_break && @first_connect && @send_queue.size == 0
+								close_connection_after_writing
+								@disconnecting = true
+								@com_paused = true
+								@first_connect = false
+							elsif @com_paused
+								@com_paused = false
+								@wait_queue.push(nil)
+							else
+								EM.defer do
+									logger.info "Reconnected, communications not paused."
+								end
 							end
 						end
 					end

data/lib/automate-em/device/tcp_control.rb

@@ -51,9 +51,7 @@ module AutomateEm
 				if !@tls_enabled
 					@connected = true
 					@connecting = false
-					EM.defer do
-						call_connected
-					end
+					call_connected
 				else
 					if !@parent.respond_to?(:certificates)
 						start_tls
@@ -78,9 +76,7 @@ module AutomateEm
 			def ssl_handshake_completed
 				@connected = true
 				@connecting = false
-				EM.defer do
-					call_connected(get_peer_cert)		# this will mark the true connection complete stage for encrypted devices
-				end
+				call_connected(get_peer_cert)		# this will mark the true connection complete stage for encrypted devices
 			end
 			
 

data/lib/automate-em/logic/logic.rb

@@ -16,7 +16,7 @@ module AutomateEm
 			#	NOTE:: if changed then change in device.rb 
 			#
 			@status = {}
-			@status_lock = Mutex.new
+			@status_lock = Object.new.extend(MonitorMixin)
 			@status_emit = {}	# status => condition_variable
 		end
 		

data/lib/automate-em/module_core.rb

@@ -0,0 +1,83 @@
+module AutomateEm
+	module ModuleCore
+		include Status	# The observable pattern (Should not be called directly)
+		include Constants
+		include Utilities
+		
+		#
+		# Sets up a link for the user code to the eventmachine class
+		#	This way the namespace is clean.
+		#
+		def setbase(base)
+			@base = base
+		end
+		
+		
+		def join_system(system)
+			@system_lock.synchronize {
+				@systems << system
+			}
+		end
+		
+		def leave_system(system)
+			@system_lock.synchronize {
+				@systems.delete(system)
+				return @systems.length
+			}
+		end
+		
+		def clear_active_timers
+			@schedule.clear_jobs unless @schedule.nil?
+		end
+		
+		
+		#def command_successful(result)			# TODO:: needs a re-think
+		#	@base.process_data_result(result)
+		#end
+		
+
+		def logger
+			@system_lock.synchronize {
+				return @systems[0].logger unless @systems.empty?
+			}
+			System.logger
+		end
+		
+		attr_reader :systems
+		attr_reader :base
+		
+		
+		protected
+		
+		
+		#
+		# Configuration and settings
+		# => Get all zones that the pod is in with the setting set and select the first setting
+		# => TODO:: Replace this with NoSQL
+		#
+		def setting(name)
+			val = config.settings.where("name = ?", name.to_s).first
+			if val.nil?
+				val = config.control_system.zones.joins(:settings).where('settings.name = ?', name.to_s).first
+				val = val.settings.where("name = ?", name.to_s).first unless val.nil?
+				
+				val = config.dependency.settings.where("name = ?", name.to_s).first if val.nil?
+			end
+			
+			if val.present?
+				case val.value_type
+					when 0
+						return val.text_value
+					when 1
+						return val.integer_value
+					when 2
+						return val.float_value
+					when 3
+						return val.datetime_value
+				end
+			end
+			
+			return nil
+		end
+	end
+end

data/lib/automate-em/service/service.rb

@@ -11,7 +11,7 @@ module AutomateEm
 			#	NOTE:: if changed then change in logic.rb 
 			#
 			@status = {}
-			@status_lock = Mutex.new
+			@status_lock = Object.new.extend(MonitorMixin)
 			@system_lock = Mutex.new
 			@status_waiting = false
 		end

data/lib/automate-em/status.rb

@@ -6,35 +6,48 @@ module AutomateEm
 
 		def [] (status)
 			status = status.to_sym if status.class == String
-			@status_lock.synchronize {
+			@status_lock.mon_synchronize {
 				return @status[status]
 			}
 		end
 		
 		def []= (status, data)
 			status = status.to_sym if status.class == String
-			old_data = check_for_emit(status, data)
 			
-			if data != old_data
-				changed								# so that the notify is applied
-				logger.debug "#{self.class} status updated: #{status} = #{data}"
-			end
-			
-			
-			notify_observers(self, status, data)	# only notify changes
+			@status_lock.mon_synchronize {
+				old_data = check_for_emit(status, data)
+				
+				if data != old_data
+					changed								# so that the notify is applied
+					logger.debug "#{self.class} status updated: #{status} = #{data}"
+				end
+				
+				notify_observers(self, status, data)	# only notify changes
+			}
+		end
+		
+		def update_status(status, &block)
+			status = status.to_sym if status.class == String
+			@status_lock.mon_synchronize {
+				data = @status[status]
+				data = data.clone unless data.nil?
+				newValue = block.call(data)
+				self[status] = newValue
+				return @status[status]
+			}
 		end
 		
 		attr_reader :status	# Should not be accessed like this for modification
 		
 		
 		def mark_emit_start(status)
-			@status_lock.synchronize {
+			@status_lock.mon_synchronize {
 				@emit_hasnt_occured = status
 			}
 		end
 		
 		def mark_emit_end
-			@status_lock.synchronize {
+			@status_lock.mon_synchronize {
 				@emit_hasnt_occured.each_pair do | key, block |
 					data = @status[key]
 					task do
@@ -56,7 +69,7 @@ module AutomateEm
 		
 		
 		def check_for_emit(status, data)
-			@status_lock.synchronize {
+			@status_lock.mon_synchronize {
 				old_data = @status[status]
 				@status[status] = data
 				

data/lib/automate-em/version.rb

@@ -1,3 +1,3 @@
 module AutomateEm
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/automate-em.rb

@@ -32,6 +32,7 @@ require 'ipaddress'
 require 'automate-em/constants.rb'
 require 'automate-em/utilities.rb'
 require 'automate-em/status.rb'
+require 'automate-em/module_core.rb'
 
 require 'automate-em/core/resolver_pool.rb'
 require 'automate-em/core/modules.rb'
@@ -122,17 +123,46 @@ module AutomateEm
 			#
 			# Load the system based on the database
 			#
-			ControlSystem.all.each do |controller|
+			ControlSystem.update_all(:active => false)
+			ControlSystem.find_each do |controller|
 				EM.defer do
 					begin
 						System.logger.debug "Booting #{controller.name}"
-						System.new_system(controller, Rails.configuration.automate.log_level)
+						result = System.start(controller, Rails.configuration.automate.log_level)
+						if result == false
+							#
+							# TODO:: we need a class for handling failed starts
+							#
+							AutomateEm.print_error(AutomateEm::System.logger, e, {
+								:message => "System #{controller.name} failed to start (gracefully). It is now offline",
+								:level => Logger::WARN
+							})
+							controller.active = false
+							controller.save
+							@@scheduler.in '5m' do
+								System.start(controller, Rails.configuration.automate.log_level)
+							end
+						end
 					rescue => e
 						AutomateEm.print_error(AutomateEm::System.logger, e, {
-							:message => "Error during boot",
-							:level => Logger::FATAL
+							:message => "System #{controller.name} threw an error whilst starting. It is now offline",
+							:level => Logger::WARN
 						})
-						EventMachine::stop_event_loop
+						#
+						# Mark as offline, do not retry and email
+						#
+						begin
+							controller.active = false
+							controller.save
+							#
+							# TODO:: email admin about failure
+							#
+						rescue => e
+							AutomateEm.print_error(AutomateEm::System.logger, e, {
+								:message => "Error marking system as offline",
+								:level => Logger::ERROR
+							})
+						end
 					end
 				end
 			end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automate-em
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: 1.0.0.beta.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: 1.0.0.beta.4.1
 - !ruby/object:Gem::Dependency
   name: em-priority-queue
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +230,7 @@ files:
 - lib/automate-em/interfaces/OLD CODE/telnet/ansi.rb
 - lib/automate-em/interfaces/OLD CODE/telnet/telnet.rb
 - lib/automate-em/logic/logic.rb
+- lib/automate-em/module_core.rb
 - lib/automate-em/service/http_service.rb
 - lib/automate-em/service/service.rb
 - lib/automate-em/status.rb