.gitignore templates/mongrel templates/thin test/fixtures/thin_cluster.conf @@ -1,14 +1,15 @@ h1. monit_conf -monit_conf is a script that generates monit configuration file(s) from one or more mongrel cluster configuration files. +monit_conf is a script that generates monit configuration file(s). It can generate monit configuration files from both thin and mongrel cluster configuration files. + Using monit_conf has the following benefits: -* Easier to setup monit correctly. +* Easier to setup monit to correctly monitor thin and mongrel servers. * Uses a proven monit configuration file that handles mongrel crashes and stale pids correctly. -The script looks for mongrel cluster configuration files (eg. mongrel_cluster.yml) in the specified directory, -and generates one configuration file for every mongrel cluster configuration file it finds. +The script looks for thin and mongrel cluster configuration files (thin_cluster.conf and mongrel_cluster.yml) in the specified directory, +and generates one configuration file for every cluster configuration file it finds. h2. Install @@ -22,7 +23,7 @@ rake install_gem h2. Requirements -Currently monit_conf assumes that you have mongrel_cluster.yml in RAILS_ROOT/config (can be a link). +Currently monit_conf assumes that you have thin_cluster.conf and/or mongrel_cluster.yml in RAILS_ROOT/config (can be a link). h2. Usage @@ -32,12 +33,12 @@ To generate the monit configuration run the monit_conf command: <code> $ monit_conf - Searching for 'mongrel_cluster.yml' in '/var/www/**/current/**' + Searching for '{thin_cluster.conf,mongrel_cluster.yml}' in '/var/www/**/current/**' </code> </pre> -As you can see the script will by default look for mongrel_cluster.yml files in /var/www/**/current/**. +As you can see the script will by default look for thin_cluster.conf and mongrel_cluster.yml files in /var/www/**/current/**. See the help documentation for details on how to change this behavior: @@ -48,11 +49,10 @@ $ monit_conf --help Usage: monit_conf [OPTIONS] -Generates monit configuration file(s) from one or more mongrel cluster configuration files. - -Script looks for mongrel cluster configuration files (eg. mongrel_cluster.yml) in the specified directory, -and generates a separate configuration file for each mongrel cluster configuration found. +Generates monit configuration file(s) from one or more thin/mongrel cluster configuration files. +The script searches for thin and mongrel cluster configuration files (thin_cluster.conf and mongrel_cluster.yml) in the specified directory, +and generates a separate configuration file for each cluster configuration found. Optional arguments: @@ -60,10 +60,10 @@ Optional arguments: Default: /var/www/**/current/** --output=[val] Where monit configuration files will be written. Default: /etc/monit/include - --mongrel_conf=[val] Name of mongrel cluster configuration, usually mongrel_cluster.yml. - Default: mongrel_cluster.yml - --monit_template=[val] The template used when generating monit configuration files. - Default: /usr/local/lib/ruby/gems/1.8/gems/monit_conf-0.0.1/templates/monit_include + --pattern=[val] Pattern that matches mongrel and/or thin configuration files (Dir.glob syntax). + Default: {thin_cluster.conf,mongrel_cluster.yml} + --template_dir=[val] The directory where monit templates for thin and mongrel are found. + Default: /usr/local/lib/ruby/gems/1.8/gems/monit_conf-x.x.x/templates/ -h, --help Show this help message. @@ -108,6 +108,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. h2. Todo * Better group names +* Better defaults (we're assuming that the configuration files contains xyz at the moment) +* Refactor h2. Author README.textile @@ -21,8 +21,8 @@ end OPTIONS = { :output => "/etc/monit/include", :input => "/var/www/**/current/**", - :mongrel_conf => "mongrel_cluster.yml", - :monit_template => File.expand_path("#{root_dir}/templates/monit_include") + :pattern => "{mongrel_cluster.yml,thin_cluster.conf}", + :template_dir => File.expand_path("#{root_dir}/templates/") } # Parse options @@ -48,17 +48,17 @@ and generates a separate configuration file for each mongrel cluster configurati o.separator "Optional arguments:" o.on("--input=[val]", String, - "Where to look for mongrel_cluster.yml files. Also see --mongrel_conf switch.", + "Directory where configuration files are located. Also see --pattern switch.", "Default: #{OPTIONS[:input]}") { |OPTIONS[:input]| } o.on("--output=[val]", String, "Where monit configuration files will be written.", "Default: #{OPTIONS[:output]}") { |OPTIONS[:output]| } - o.on("--mongrel_conf=[val]", String, - "Name of mongrel cluster configuration, usually mongrel_cluster.yml.", - "Default: #{OPTIONS[:mongrel_conf]}") { |OPTIONS[:mongrel_conf]| } - o.on("--monit_template=[val]", String, - "The template used when generating monit configuration files.", - "Default: #{OPTIONS[:monit_template]}") { |OPTIONS[:monit_template]| } + o.on("--pattern=[val]", String, + "Pattern used for finding configuration files, usually mongrel_cluster.yml, thin_cluster.conf or a combination {mongrel_cluster.yml,thin_cluster.conf}.", + "Default: #{OPTIONS[:pattern]}") { |OPTIONS[:pattern]| } + o.on("--template_dir=[val]", String, + "The directory where templates are stored. These are used when generating monit configuration files.", + "Default: #{OPTIONS[:template_dir]}") { |OPTIONS[:template_dir]| } o.separator "" bin/monit_conf @@ -1,6 +1,8 @@ require 'yaml' require 'fileutils' +# TODO Thin support was added in a hurry so code needs some refactoring. + module MonitConf class Generator @@ -10,30 +12,44 @@ module MonitConf #raise options.inspect - monit_template = options[:monit_template] - mongrel_conf = options[:mongrel_conf] + template_dir = options[:template_dir] + pattern = options[:pattern] input = options[:input] output = options[:output] puts " - Searching for '#{mongrel_conf}' in '#{input}' + Searching for '#{pattern}' in '#{input}' " - Dir.glob("#{input}/#{mongrel_conf}").each do |file| + Dir.glob("#{input}/#{pattern}").each do |file| vars = YAML::load(File.open(file)) - - vars['mongrel_conf'] = mongrel_conf if !vars.has_key?(:mongrel_conf) + vars['configuration'] = file if !vars.has_key?(:configuration) start_port = vars['port'].to_i end_port = start_port + vars['servers'].to_i + template = "" monit_conf = "" + # Detect thin configuration files + # TODO Refactor + is_thin = file =~ /thin/ + + if is_thin + template = "#{template_dir}/thin" + vars['cwd'] = vars['chdir'] if vars.has_key?('chdir') + vars['pid_file'] = vars['pid'] if vars.has_key?('pid') + else # Assume it's a mongrel configuration file + template = "#{template_dir}/mongrel" + end + # Fine tune settings vars['cwd'] = "#{vars['cwd']}/" if vars['cwd'][-1,1] != '/' # cwd should end with / - vars['name'] = "mongrel-#{start_port}-#{end_port}" if !vars.has_key?('name') # better names if name is not set + vars['name'] = "#{start_port}-#{end_port}" if !vars.has_key?('name') # better names if name is not set vars['pid_file'] = "#{vars['cwd']}#{vars['pid_file']}" if vars['pid_file'][0,1] != '/' # Make pid path absolute + index = 0 + while start_port < end_port server_vars = vars.dup @@ -41,12 +57,19 @@ module MonitConf # Trim the pid_file extension and add the correct port server_vars['pid_file'] = vars['pid_file'].gsub(/\.pid$/, '') server_vars['pid_file'] = "#{server_vars['pid_file']}.#{server_vars['port']}.pid" - - server_vars['mongrel_conf'] = file + server_vars['index'] = index + + # TODO Refactor + if is_thin + server_vars['socket'] = vars['socket'].gsub(/\.sock$/, '') + server_vars['socket'] = "#{server_vars['socket']}.#{index}.sock" + end + + server_vars['configuration'] = File.expand_path(file) start_port = start_port + 1 - - monit_conf = monit_conf + MonitConf::Template.new(monit_template).exec(server_vars) + index = index + 1 + monit_conf = monit_conf + MonitConf::Template.new(template).exec(server_vars) end filename = "#{output}/#{vars['name']}" @@ -63,4 +86,4 @@ module MonitConf end end -end \ No newline at end of file +end lib/monit_conf/generator.rb pkg/monit_conf-0.0.1.gem pkg/monit_conf-0.0.1.tgz pkg/monit_conf-0.0.1/History.txt pkg/monit_conf-0.0.1/Manifest.txt pkg/monit_conf-0.0.1/PostInstall.txt pkg/monit_conf-0.0.1/README.rdoc pkg/monit_conf-0.0.1/Rakefile pkg/monit_conf-0.0.1/bin/monit_conf pkg/monit_conf-0.0.1/lib/monit_conf.rb pkg/monit_conf-0.0.1/lib/monit_conf/generator.rb pkg/monit_conf-0.0.1/lib/monit_conf/template.rb pkg/monit_conf-0.0.1/templates/monit_include pkg/monit_conf-0.0.1/test/test_helper.rb pkg/monit_conf-0.0.1/test/test_monit_conf.rb templates/monit_include f001fc9793eb0bb952389e57e7b378b53ac19be1 Christian Hellsten christian.hellsten@gmail.com http://github.com/christianhellsten/monit_conf/commit/b3c26feb879851933a5b45b79a08290e20ae31e2 b3c26feb879851933a5b45b79a08290e20ae31e2 2008-12-29T14:42:36-08:00 2008-12-29T14:42:36-08:00 Added thin support. Code needs to be refactored later... 35fc6e70848038d4024baa4949b16a756802ccc1 Christian Hellsten christian.hellsten@gmail.com