From cbf35664160a57da4c96796e99911b982afacba2 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 4 Feb 2014 09:11:00 +0100
Subject: only set flags if they are defined

---
 lib/tapicero.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tapicero.rb b/lib/tapicero.rb
index e2a8f38..0c7007f 100644
--- a/lib/tapicero.rb
+++ b/lib/tapicero.rb
@@ -23,8 +23,10 @@ module Tapicero
   self.logger = CouchRest::Changes::Config.logger
 
   # hand flags over to CouchRest::Changes
-  config.flags = FLAGS
-  puts "flags: #{FLAGS}" if FLAGS.any?
+  if defined? FLAGS
+    config.flags = FLAGS
+    puts "flags: #{FLAGS}" if FLAGS.any?
+  end
 
   #
   # Load Tapicero Parts
-- 
cgit v1.2.3


From ee4f24abf2a7848a015cfb02bfbdebf7b0874d8e Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 4 Feb 2014 09:16:19 +0100
Subject: hand config files on the command line to the daemon

---
 lib/tapicero.rb         | 6 +-----
 lib/tapicero/version.rb | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/tapicero.rb b/lib/tapicero.rb
index 0c7007f..390257d 100644
--- a/lib/tapicero.rb
+++ b/lib/tapicero.rb
@@ -1,9 +1,6 @@
 unless defined? BASE_DIR
   BASE_DIR = Pathname.new(__FILE__) + '../..'
 end
-unless defined? TAPICERO_CONFIG
-  TAPICERO_CONFIG = '/etc/leap/tapicero.yaml'
-end
 
 module Tapicero
   class <<self
@@ -18,8 +15,7 @@ module Tapicero
   # defined before the models are defined.
   #
   require 'couchrest/changes'
-  configs = ['config/default.yaml', TAPICERO_CONFIG, ARGV.grep(/\.ya?ml$/).first]
-  self.config = CouchRest::Changes::Config.load(BASE_DIR, *configs)
+  self.config = CouchRest::Changes::Config.load(BASE_DIR, *CONFIGS)
   self.logger = CouchRest::Changes::Config.logger
 
   # hand flags over to CouchRest::Changes
diff --git a/lib/tapicero/version.rb b/lib/tapicero/version.rb
index 1d372e5..9841437 100644
--- a/lib/tapicero/version.rb
+++ b/lib/tapicero/version.rb
@@ -2,4 +2,5 @@ module Tapicero
   VERSION = "0.3.2"
   REQUIRE_PATHS = ['lib']
   FLAGS = []
+  CONFIGS = ['config/default.yaml', '/etc/leap/tapicero.yaml']
 end
-- 
cgit v1.2.3