ACK and pushed. I made one very small change, namely renaming 'event_log_pos_dir' and corresponding optparse message to 'dbomatic_runtime_dir'. If you don't like this, we can change it back.
Also pushed a very small addition afterwards that gracefully exists if an invalid command line option is passed in. -Mo On 09/09/2010 04:52 PM, Chris Lalancette wrote: > This is so we can support running dbomatic against condor > running in non-standard directories. > > Signed-off-by: Chris Lalancette<[email protected]> > --- > src/dbomatic/dbomatic.rb | 37 +++++++++++++++++++++++++++++++++---- > 1 files changed, 33 insertions(+), 4 deletions(-) > > diff --git a/src/dbomatic/dbomatic.rb b/src/dbomatic/dbomatic.rb > index 1fd8948..260d7ad 100644 > --- a/src/dbomatic/dbomatic.rb > +++ b/src/dbomatic/dbomatic.rb > @@ -20,10 +20,39 @@ $:<< File.join(File.dirname(__FILE__), "../dutils") > require 'dutils' > require 'nokogiri' > require 'rb-inotify' > +require 'optparse' > > -CONDOR_EVENT_LOG_DIR = "/var/log/condor" > -CONDOR_EVENT_LOG_FILE = "#{CONDOR_EVENT_LOG_DIR}/EventLog" > -EVENT_LOG_POS_FILE = "/var/run/dbomatic/event_log_position" > +help = false > + > +condor_event_log_dir = "/var/log/condor" > +event_log_pos_dir = "/var/run/dbomatic" > + > +optparse = OptionParser.new do |opts| > + > +opts.banner =<<BANNER > +Usage: > +dbomatic [options] > + > +Options: > +BANNER > + opts.on( '-p', '--path PATH', 'Use PATH to the condor log directory') do > |newpath| > + condor_event_log_dir = newpath > + end > + opts.on( '-o', '--pos PATH', 'Use PATH to the event log position > directory') do |newpath| > + event_log_pos_dir = newpath > + end > + opts.on( '-h', '--help', '') { help = true } > +end > + > +optparse.parse! > + > +if help > + puts optparse > + exit(0) > +end > + > +CONDOR_EVENT_LOG_FILE = "#{condor_event_log_dir}/EventLog" > +EVENT_LOG_POS_FILE = "#{event_log_pos_dir}/event_log_position" > > # Handle the event log's xml > class CondorEventLog< Nokogiri::XML::SAX::Document > @@ -95,7 +124,7 @@ if File.exists? CONDOR_EVENT_LOG_FILE > > # if log file doesn't exist wait until it does > else > - notifier.watch(CONDOR_EVENT_LOG_DIR, :create){ |event| > + notifier.watch(condor_event_log_dir, :create){ |event| > if event.name == "EventLog" > log_file = File.open(CONDOR_EVENT_LOG_FILE) > parse_log_file log_file, parser _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
