jerbil 1.3.3 → 1.4.5

data/bin/jerbil-install

@@ -38,7 +38,7 @@ Jeni::Installer.new_from_gem('jerbil') do |jeni|
   
   
   jeni.file('etc/jerbil/jerbil.rb', '/etc/jerbil/jerbil.rb', :chown=>'jerbil', :chgrp=>'jerbil', :chmod=>0640)
-  jeni.file('etc/jerbil/jerbil-client.rb', '/etc/jerbil/jerbil-client.rb', :chown=>'jerbil', :chgrp=>'jerbil', :chmod=>0640)
+  jeni.file('etc/jerbil/jerbil-test.rb', '/etc/jerbil/jerbil-test.rb', :chown=>'jerbil', :chgrp=>'jerbil', :chmod=>0640)
   
   # configuration file to run the service
   jeni.file('etc/conf.d/jerbild', '/etc/conf.d/jerbild')

data/etc/jerbil/jerbil-old.rb

@@ -0,0 +1,83 @@
+#
+# Configuration Options for: Jelly::Options
+#
+
+# Number of log files to retain at any time, between 0 and 20
+#log_rotation 2
+
+# Location for Jelly (logging utility) to save log files
+#log_dir "/var/log/jerbil"
+
+# Set the string to be used for marking the log with logger.mark
+#log_mark "   ===== Mark ====="
+
+# Reset the logfile when starting logging by setting to true, otherwise append to
+# existing log
+#log_reset false
+
+# Setting to true (the default) will flush log messages immediately, which is useful if you
+# need to monitor logs dynamically
+#log_sync true
+
+# Size of a log file (in MB) before switching to the next log, upto 20 MB
+#log_length 1
+
+# Format string for time stamps. Needs to be a string that is recognised by String.strftime
+# Any characters not recognised by strftime will be printed verbatim, which may not be what you want
+#log_date_time_format "%Y-%m-%d %H:%M:%S"
+
+# Controls the amount of logging done by Jelly
+# 
+#  * :system - standard message, plus log to syslog
+#  * :verbose - more generous logging to help resolve problems
+#  * :debug - usually used only for resolving problems during development
+# 
+#log_level :system
+
+# Set to false to suppress colourful logging. Default colours can be changed by calling
+# colours= method
+#log_coloured true
+
+#
+# Configuration Options for: JerbilService::Config
+#
+
+# private key dir used to authenticate privileged users
+#key_dir "/var/run/jerbil"
+
+# Set the default environment for service commands etc.
+# 
+# Can be one of :prod, :test, :dev
+#environment :prod
+
+# Set this only to use a Jerbil Server that is not running in the production environment
+#jerbil_env 
+
+# directory used to store the daemons pid to assist in stopping reluctant servers
+#pid_dir "/var/run/jerbil"
+
+#
+# Configuration Options for: Jerbil::Config
+#
+
+# A secret key available to all Jerbil Servers and used to authenticate the initial registration.
+# If security is an issue, ensure that this config file is readable only be trusted users
+secret "hK78l/z1mIDBOs+/Qx2q7k5beExChmdc3tpw81qTBNLmcQknRrY93oHzIAd3DNo2"
+
+# A valid netmask for the hosts to search using the above net address. This should be
+# between 24 (a class C network) and 30, beyound which its not much of a network. If you only have a few
+# hosts it will be easier to restrict them to a small subnet.
+# 
+# To find out more about netmasks, go to [UnixWiz](http://www.unixwiz.net/techtips/netmask-ref.html).
+#net_mask 26
+
+# Provide a timeout when searching for jerbil servers on the net during startup.
+# Depending on the size of the net mask this timeout may make the search long.
+# The default should work in most cases
+#scan_timeout 0.1
+
+# A valid IPv4 address for the LAN on which the servers will operate.
+# Note that the broker uses this address to search for all servers.
+# Therefore a large range will take a long time to search. Set the net_mask to limit this.
+#net_address "192.168.0.1"
+

data/etc/jerbil/jerbil-test.rb

@@ -0,0 +1,105 @@
+#
+# Configuration Options for: Jellog::Config
+#
+
+# Path to a writeable directory where Jellog will save log files.
+#log_dir "/var/log/jerbil"
+
+# Controls the amount of logging done by Jellog
+# 
+#  * :system - standard message, plus log to syslog
+#  * :verbose - more generous logging to help resolve problems
+#  * :debug - usually used only for resolving problems during development
+# 
+log_level :debug
+
+# Number of log files to retain at any time, between 0 and 20
+#log_rotation 2
+
+# Size of a log file (in MB) before switching to the next log, upto 20 MB
+#log_length 1
+
+# Reset the logfile when starting logging by setting to true, otherwise append to
+# existing log
+#log_reset false
+
+# Set to false to suppress colourful logging. Default colours can be changed by calling
+# #colours= method
+#log_coloured true
+
+# Format string for time stamps. Needs to be a string that is recognised by String#strftime
+# Any characters not recognised by strftime will be printed verbatim, which may not be what you want
+#log_date_time_format "%Y-%m-%d %H:%M:%S"
+
+# Setting to true (the default) will flush log messages immediately, which is useful if you
+# need to monitor logs dynamically
+#log_sync true
+
+# Set the string to be used for marking the log with logger.mark
+#log_mark "   ===== Mark ====="
+
+# Set to true to prevent system log calls from logging to syslog as well
+#disable_syslog false
+
+#
+# Configuration Options for: JerbilService::Config
+#
+
+# Set the environment for the service to run in.
+# 
+# Can be one of the following:
+#   :prod - for productionised services in use across a network 
+#   :test - for testing a release candidate, e.g. also across the network
+#   :dev - for developing the next release
+# 
+# Services can be running in all three environments at the same time. Clients
+# will need to use the appropriate config file to connect with each environment.
+environment :test
+
+# a writable directory where Jerbil stores a private key for each service.
+# This key is used to authenticate systems operations, such as stopping the service.
+# It is not used for client interactions, which can require a separate service key.
+#key_dir "/var/run/jerbil"
+
+# A writable directory used to store the pid to assist in stopping reluctant servers
+#pid_dir "/var/run/jerbil"
+
+# Set this only to use a Jerbil Server that is not running in the production environment
+#jerbil_env 
+
+#
+# Configuration Options for: Jerbil::Config
+#
+
+# A valid IPv4 address for the LAN on which the servers will operate.
+# Note that the broker uses this address to search for all servers.
+# Therefore a large range will take a long time to search. Set the net_mask to limit this.
+#net_address "192.168.0.1"
+
+# A valid netmask for the hosts to search using the above net address. This should be
+# between 24 (a class C network) and 30, beyound which its not much of a network. If you only have a few
+# hosts it will be easier to restrict them to a small subnet.
+# 
+# To find out more about netmasks, go to [UnixWiz](http://www.unixwiz.net/techtips/netmask-ref.html).
+#net_mask 26
+
+# Provide a timeout in seconds when searching for jerbil servers on the net during startup.
+# Depending on the size of the net mask this timeout may make the search long.
+# The default should work in most cases
+#scan_timeout 0.1
+
+# Define how many times the monitor process will check for other servers
+# at start up. Limited to at least once and at most 10 times. Probably is not need
+# to check more than 3 times unless you set a very short scan timeout.
+#check_count 3
+
+# Define the delay between successive checks carried out by the monitor at start up.
+# Setting it to 0 will cause the checks to be completed without delay. The upper limit is
+# an hour for no particular reason. Default should work for most cases. Could be quicker on smaller
+# nets with fewer machines to check each time.
+#loop_time 30
+
+# A secret key available to all Jerbil Servers and used to authenticate the initial registration.
+# If security is an issue, ensure that this config file is readable only be trusted users
+secret "Change Me!"
+

data/etc/jerbil/jerbil.rb

@@ -1,68 +1,80 @@
 #
-# Configuration Options for: Jelly::Options
+# Configuration Options for: Jellog::Config
 #
 
+# Path to a writeable directory where Jellog will save log files.
+#log_dir "/var/log/jerbil"
+
+# Controls the amount of logging done by Jellog
+# 
+#  * :system - standard message, plus log to syslog
+#  * :verbose - more generous logging to help resolve problems
+#  * :debug - usually used only for resolving problems during development
+# 
+#log_level :system
+
 # Number of log files to retain at any time, between 0 and 20
 #log_rotation 2
 
-# Location for Jelly (logging utility) to save log files
-#log_dir "/var/log/jerbil"
-
-# Set the string to be used for marking the log with logger.mark
-#log_mark "   ===== Mark ====="
+# Size of a log file (in MB) before switching to the next log, upto 20 MB
+#log_length 1
 
 # Reset the logfile when starting logging by setting to true, otherwise append to
 # existing log
 #log_reset false
 
-# Setting to true (the default) will flush log messages immediately, which is useful if you
-# need to monitor logs dynamically
-#log_sync true
-
-# Size of a log file (in MB) before switching to the next log, upto 20 MB
-#log_length 1
+# Set to false to suppress colourful logging. Default colours can be changed by calling
+# #colours= method
+#log_coloured true
 
-# Format string for time stamps. Needs to be a string that is recognised by String.strftime
+# Format string for time stamps. Needs to be a string that is recognised by String#strftime
 # Any characters not recognised by strftime will be printed verbatim, which may not be what you want
 #log_date_time_format "%Y-%m-%d %H:%M:%S"
 
-# Controls the amount of logging done by Jelly
-# 
-#  * :system - standard message, plus log to syslog
-#  * :verbose - more generous logging to help resolve problems
-#  * :debug - usually used only for resolving problems during development
-# 
-#log_level :system
+# Setting to true (the default) will flush log messages immediately, which is useful if you
+# need to monitor logs dynamically
+#log_sync true
 
-# Set to false to suppress colourful logging. Default colours can be changed by calling
-# colours= method
-#log_coloured true
+# Set the string to be used for marking the log with logger.mark
+#log_mark "   ===== Mark ====="
+
+# Set to true to prevent system log calls from logging to syslog as well
+#disable_syslog false
 
 #
 # Configuration Options for: JerbilService::Config
 #
 
-# private key dir used to authenticate privileged users
-#key_dir "/var/run/jerbil"
-
-# Set the default environment for service commands etc.
+# Set the environment for the service to run in.
+# 
+# Can be one of the following:
+#   :prod - for productionised services in use across a network 
+#   :test - for testing a release candidate, e.g. also across the network
+#   :dev - for developing the next release
 # 
-# Can be one of :prod, :test, :dev
+# Services can be running in all three environments at the same time. Clients
+# will need to use the appropriate config file to connect with each environment.
 #environment :prod
 
-# Set this only to use a Jerbil Server that is not running in the production environment
-#jerbil_env 
+# a writable directory where Jerbil stores a private key for each service.
+# This key is used to authenticate systems operations, such as stopping the service.
+# It is not used for client interactions, which can require a separate service key.
+#key_dir "/var/run/jerbil"
 
-# directory used to store the daemons pid to assist in stopping reluctant servers
+# A writable directory used to store the pid to assist in stopping reluctant servers
 #pid_dir "/var/run/jerbil"
 
+# Set this only to use a Jerbil Server that is not running in the production environment
+#jerbil_env 
+
 #
 # Configuration Options for: Jerbil::Config
 #
 
-# A secret key available to all Jerbil Servers and used to authenticate the initial registration.
-# If security is an issue, ensure that this config file is readable only be trusted users
-secret "hK78l/z1mIDBOs+/Qx2q7k5beExChmdc3tpw81qTBNLmcQknRrY93oHzIAd3DNo2"
+# A valid IPv4 address for the LAN on which the servers will operate.
+# Note that the broker uses this address to search for all servers.
+# Therefore a large range will take a long time to search. Set the net_mask to limit this.
+#net_address "192.168.0.1"
 
 # A valid netmask for the hosts to search using the above net address. This should be
 # between 24 (a class C network) and 30, beyound which its not much of a network. If you only have a few
@@ -71,13 +83,23 @@ secret "hK78l/z1mIDBOs+/Qx2q7k5beExChmdc3tpw81qTBNLmcQknRrY93oHzIAd3DNo2"
 # To find out more about netmasks, go to [UnixWiz](http://www.unixwiz.net/techtips/netmask-ref.html).
 #net_mask 26
 
-# Provide a timeout when searching for jerbil servers on the net during startup.
+# Provide a timeout in seconds when searching for jerbil servers on the net during startup.
 # Depending on the size of the net mask this timeout may make the search long.
 # The default should work in most cases
 #scan_timeout 0.1
 
-# A valid IPv4 address for the LAN on which the servers will operate.
-# Note that the broker uses this address to search for all servers.
-# Therefore a large range will take a long time to search. Set the net_mask to limit this.
-#net_address "192.168.0.1"
+# Define how many times the monitor process will check for other servers
+# at start up. Limited to at least once and at most 10 times. Probably is not need
+# to check more than 3 times unless you set a very short scan timeout.
+#check_count 3
+
+# Define the delay between successive checks carried out by the monitor at start up.
+# Setting it to 0 will cause the checks to be completed without delay. The upper limit is
+# an hour for no particular reason. Default should work for most cases. Could be quicker on smaller
+# nets with fewer machines to check each time.
+#loop_time 30
+
+# A secret key available to all Jerbil Servers and used to authenticate the initial registration.
+# If security is an issue, ensure that this config file is readable only be trusted users
+secret "Change Me!"
 

data/lib/jerbil.rb

@@ -103,21 +103,24 @@ module Jerbil
       @remote_store = Array.new
 
       # create a jellog logger that continues any previous log and keeps the last 5 log files
-      app_name = "Jerbil-#{options[:environment].to_s}"
-      log_opts = Jellog::Logger.get_options(options)
-      @logger = Jellog::Logger.new(app_name, log_opts)
+      @app_name = "Jerbil-#{options[:environment].to_s}"
+      @log_opts = Jellog::Config.intersection(options)
+      #log_opts = @log_opts.dup
+      @logger = Jellog::Logger.new(@app_name, @log_opts)
       @logger.mark
       @logger.debug "Started the Logger for Jerbil"
+      @logger.debug "Saved logger options: #{@log_opts.inspect}"
 
 
       # some statistical data
       @started = Time.now
       @registrations = 0
       @logger.verbose("Searching for remote servers")
-      network_servers = Jerbil::Servers.find_servers(@env, options[:net_address], options[:net_mask], options[:scan_timeout])
-      @logger.verbose("Found #{@remote_servers.length} remote servers")
+      network_servers = [] #Jerbil::Servers.find_servers(@env, options[:net_address], options[:net_mask], options[:scan_timeout])
+      #@logger.verbose("Found #{@remote_servers.length} remote servers")
 
       # now loop round the remote servers to see if any are there
+      # DO NOTHING cos its an empty array!
       network_servers.each do |remote_server|
         rjerbil = remote_server.connect
         unless rjerbil.nil?
@@ -153,10 +156,21 @@ module Jerbil
         @logger.debug "   #{rs.fqdn}: #{rs.key}"
       end
       
+      #@logger.verbose "Closing logger temporarily"
+      #@logger.close
+      
     rescue => jerr
       @logger.exception(jerr)
       raise
     end
+    
+    # restart the logger on the other side of daemonising it
+    #
+    # NOT NEEDED!
+    def restart_logger
+      @logger = Jellog::Logger.new(@app_name, @log_opts)     
+      @logger.debug "Restarted Logger"
+    end
 
     # date/time at which the server was started
     attr_reader :started
@@ -370,6 +384,18 @@ module Jerbil
     def get_all(ignore_access=false)
       self.find(:ignore_access => ignore_access)
     end
+    
+    def get_all_by_server
+      services = self.find(ignore_access: true)
+      servers = Hash.new
+      services.each do |serv|
+        unless servers.has_key?(serv.host)
+          servers[serv.host] = Array.new
+        end
+        servers[serv.host] << serv
+      end
+      return servers
+    end
 
     # Checks for a potentially missing service and removes it if it cannot be found.
     #
@@ -470,7 +496,7 @@ module Jerbil
         @remote_servers.each do |rserver|
           begin
             rjerbil = rserver.connect
-            @logger.verbose("Closing connection to; #{rserver.ident}")
+            @logger.verbose("Closing connection to: #{rserver.ident}")
             rjerbil.detach_server(rserver.key, @local) 
           rescue ServerConnectError, DRb::DRbConnError
             @logger.error("Failed to connect to #{rserver.ident}")
@@ -600,12 +626,18 @@ module Jerbil
     # @param [String] my_key being the key of the server being called
     # @param [Server] server being the record for the remote server that is detaching
     def detach_server(my_key, server)
-      @logger.verbose("About to detach a remote server: #{server.ident}")
      
       unless @private_key == my_key
-        @logger.warn("close_remote_server: incorrect key: #{my_key}")
-        return true
+        @logger.warn("Detaching remote server: incorrect key: #{my_key}")
+        return false
       end
+      
+      unless @remote_servers.include?(server)
+        @logger.warn "Detaching remote server: server not known: #{server.ident}"
+        return false
+      end
+      
+      @logger.verbose("About to detach a remote server: #{server.ident}")
       @remote_store.delete_if {|s| s.host == server.fqdn}
       @remote_servers.delete(server)
       @logger.info("Detached server: #{server.ident}")

data/lib/jerbil/config.rb

@@ -50,13 +50,30 @@ module Jerbil
     
     def configure_scan_timeout(tim)
       default 0.1
-      comment "Provide a timeout when searching for jerbil servers on the net during startup.",
+      comment "Provide a timeout in seconds when searching for jerbil servers on the net during startup.",
         "Depending on the size of the net mask this timeout may make the search long.",
         "The default should work in most cases"
         
       a_type_of(tim, Numeric)
     end
     
+    def configure_check_count(count)
+      default 3
+      comment "Define how many times the monitor process will check for other servers",
+        "at start up. Limited to at least once and at most 10 times. Probably is not need",
+        "to check more than 3 times unless you set a very short scan timeout."
+      in_range(count, 1, 10)
+    end
+    
+    def configure_loop_time(delay)
+      default 30
+      comment "Define the delay between successive checks carried out by the monitor at start up.",
+        "Setting it to 0 will cause the checks to be completed without delay. The upper limit is",
+        "an hour for no particular reason. Default should work for most cases. Could be quicker on smaller",
+        "nets with fewer machines to check each time."
+      in_range(delay, 0, 360)
+    end
+    
     def configure_secret(scrt)
       comment "A secret key available to all Jerbil Servers and used to authenticate the initial registration.",
        "If security is an issue, ensure that this config file is readable only be trusted users"