Changeset 124

Timestamp:

11/03/06 10:13:20 (2 years ago)

Author:

ska..@waste.org

Message:

- change default protocol to drbunix
- re-add DRb acl configuration
- fix case typo in setup

Files:

• trunk/server/lib/backgroundrb/scheduler.rb (modified) (1 diff)
• trunk/server/lib/backgroundrb_server.rb (modified) (5 diffs)

trunk/server/lib/backgroundrb/scheduler.rb

@@ -45 +45 @@
-              }
-              entry.job.is_a?(Proc) ? entry.job.call : entry.job.execute
-              p "here?"
-            rescue 
-              BackgrounDRb::ServerLogger.log_exception('scheduler', e) 

trunk/server/lib/backgroundrb_server.rb

@@ -8 +8 @@
-require 'tmpdir'
-require 'fileutils'
+require 'drb/acl'
-
-module BackgrounDRb
@@ -133 +134 @@
-    options[:socket_dir] = options[:temp_dir] + '/backgroundrb.' + $$.to_s
-
+    # Default ACL
+    options[:acl] ||= {
+      :deny => [
+        'all'
+      ],
+      :allow => [
+        'localhost 127.0.0.1'
+      ],
+      :order => [ 'deny' 'allow' ]
+    }
+
-    # Output accumulated configuration 
-    if options[:list]
-      puts "BackgrounDRb configuration (including cmd line arguments)"
-      options.sort_by { |k| k.to_s }.each do |k|
-
+
+
+
+
+
-      end
-      puts ""
@@ -149 +165 @@
-    # Log server configuration
-    case @cmd
- 'run' 
+'run',
-      BackgrounDRb::ServerLogger.logger.info('server') do
-        "Starting BackgrouDRb Server" 
@@ -179 +195 @@
-      FileUtils::mkdir_p(socket_dir)
-
+      # DRb Acl
+      unless @backgroundrb_options[:protocol] == "drbunix"
+        self.setup_drb_acl
+      end
+
-    when 'restart'
-      puts 'restart not supported, please stop, then start'
@@ -187 +208 @@
-    ENV['TMPDIR'] = socket_dir
-
+  end
+
+  def setup_drb_acl
+
+    acl = []
+    acl_config = @backgroundrb_options[:acl]
+
+    [:deny, :allow].each do |acl_type|
+      acl_config[acl_type].inject(acl) do |total, part|
+        part.gsub!(/,/,' ')
+        part.split(/\s+/).each do |sub_part|
+          if sub_part.is_a?(String)
+            total << "#{acl_type.to_s}"
+            total << "#{sub_part}"
+          end
+        end
+      end
+    end
+
+    # Will effectively install a DENY_ALLOW if order is not specified
+    case acl_config[:order]
+    when /\Aallow/
+      order = 1 # ALLOW_DENY.
+    else
+      order = 0 # DENY_ALLOW
+    end
+
+    begin
+      drb_acl = ACL.new(acl, order)
+      DRb.install_acl(drb_acl)
+      BackgrounDRb::ServerLogger.logger.info('server') {
+        "Installed DRb ACL"
+      }
+    rescue => e
+      BackgrounDRb::ServerLogger.logger.info('server') {
+        "Failed to install DRb ACL"
+      }
+      BackgrounDRb::ServerLogger.log_exception('server', e)
+    end
-  end
-