@@ -1,3 +1,6 @@ +== 0.9.9 +* remove dependency on SyslogLogger so that starling works on windows. + == 0.9.8 * add fix to enable relative paths <david@motorator.com> * fix tests so they don't run 10 times due to a stupid bug with how the server is forked <seth@mojodna.net> CHANGELOG @@ -2,7 +2,6 @@ require 'socket' require 'logger' require 'rubygems' require 'eventmachine' -require 'analyzer_tools/syslog_logger' here = File.dirname(__FILE__) @@ -68,12 +67,20 @@ module StarlingServer def run @stats[:start_time] = Time.now - @@logger = case @opts[:logger] - when IO, String; Logger.new(@opts[:logger]) - when Logger; @opts[:logger] - else; Logger.new(STDERR) - end - @@logger = SyslogLogger.new(@opts[:syslog_channel]) if @opts[:syslog_channel] + if @opts[:syslog_channel] + begin + require 'syslog_logger' + @@logger = SyslogLogger.new(@opts[:syslog_channel]) + rescue LoadError + # SyslogLogger isn't available, so we're just going to use Logger + end + end + + @@logger ||= case @opts[:logger] + when IO, String; Logger.new(@opts[:logger]) + when Logger; @opts[:logger] + else; Logger.new(STDERR) + end begin @opts[:queue] = QueueCollection.new(@opts[:path]) lib/starling/server.rb @@ -113,8 +113,13 @@ module StarlingServer options[:logger] = File.expand_path(log_path) end - opts.on("-l", "--syslog CHANNEL", "Write logs to the syslog instead of a log file.") do |channel| - options[:syslog_channel] = channel + begin + require 'syslog_logger' + + opts.on("-l", "--syslog CHANNEL", "Write logs to the syslog instead of a log file.") do |channel| + options[:syslog_channel] = channel + end + rescue LoadError end opts.on("-v", "Increase logging verbosity (may be used multiple times).") do lib/starling/server_runner.rb @@ -21,6 +21,5 @@ Gem::Specification.new do |s| s.extra_rdoc_files = ["README.rdoc", "CHANGELOG", "LICENSE"] s.add_dependency 'memcache-client' - s.add_dependency 'SyslogLogger' s.add_dependency 'eventmachine', [">= 0.12.0"] end starling.gemspec 9c5fbdd0dacede4ae0dd545b7b0ecd1cc854939f Blaine Cook blaine@yahoo-inc.com http://github.com/defunkt/starling/commit/fbbd39afb5c0e742789e9956baaf4f1c62a7aa41 fbbd39afb5c0e742789e9956baaf4f1c62a7aa41 2008-08-26T22:37:08-07:00 2008-08-26T22:37:08-07:00 Remove dependency on SyslogLogger so that Starling runs on Windows. 71834233aa498fcce33abfc1f43ab0cd87604bc7 Blaine Cook blaine@yahoo-inc.com