[SCM] ci-tooling packaging branch, master, updated. 7ba97974e480422f84afd220cab55aef108903b0

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=7ba9797

The following commit has been merged in the master branch:
commit 7ba97974e480422f84afd220cab55aef108903b0
Author: Rohan Garg <rohan at kde.org>
Date:   Mon Jan 26 15:17:29 2015 +0100

    Use a singleton logger
---
 dci/autopkgtest.rb |  2 +-
 dci/build.rb       |  2 +-
 dci/imager.rb      |  2 +-
 dci/mozilla.rb     |  2 +-
 dci/source.rb      |  2 +-
 lib/logger.rb      | 24 +++++++++++++++++-------
 6 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/dci/autopkgtest.rb b/dci/autopkgtest.rb
index a9873e6..4766ed6 100644
--- a/dci/autopkgtest.rb
+++ b/dci/autopkgtest.rb
@@ -1,6 +1,6 @@
 require_relative '../lib/logger'
 
-logger = new_logger
+logger = DCILogger.instance
 
 if not ARGV[1].end_with? '.changes'
     logger.fatal("#{ARGV[1]} is not an actual changes file. Abort!")
diff --git a/dci/build.rb b/dci/build.rb
index e02570d..d36a8d8 100644
--- a/dci/build.rb
+++ b/dci/build.rb
@@ -23,7 +23,7 @@ OptionParser.new do | opts |
     end
 end.parse!
 
-logger = new_logger
+logger = DCILogger.instance
 
 dpkg_buildopts = %w(-us -uc -sa)
 dpkg_buildopts << "-B" unless RbConfig::CONFIG['host_cpu'] == 'x86_64'
diff --git a/dci/imager.rb b/dci/imager.rb
index 6f05351..748519d 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -61,7 +61,7 @@ def workarounds
     puts `grep -iR plymouth-drm config/package-lists`
 end
 
-logger = new_logger
+logger = DCILogger.instance
 
 Dir.mkdir('build') unless Dir.exist? 'build'
 
diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index f37d774..0cb7e65 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -9,7 +9,7 @@ require 'date'
 fail 'Need a mozilla product to build for!' unless ARGV[1]
 fail 'Need a release to build for!' unless ARGV[2]
 
-$logger = new_logger
+$logger = DCILogger.instance
 
 PACKAGE = ARGV[1]
 RELEASE = ARGV[2]
diff --git a/dci/source.rb b/dci/source.rb
index f2b9c74..6385557 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -26,7 +26,7 @@ end.parse!
 
 raise "Release is not optional!" unless options[:release]
 
-$logger = new_logger
+$logger = DCILogger.instance
 
 $logger.info("Arguments passed were #{ARGV}")
 $logger.info("Parsed #{options}")
diff --git a/lib/logger.rb b/lib/logger.rb
index f55708b..83315a3 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -1,10 +1,20 @@
 require 'logger'
+require 'singleton'
 
+class DCILogger < Logger
+    include Singleton
+
+    def initialize
+        @logdev = Logger::LogDevice.new(STDOUT)
+        @level = INFO
+        @formatter = proc { |severity, datetime, progname, msg|
+            "DCI-#{severity} :: #{msg}
"
+        }
+    end
+end
+
+# Deprecated, use DCILogger.instance instead
 def new_logger()
-    logger = Logger.new(STDOUT)
-    original_formatter = Logger::Formatter.new
-    logger.formatter = proc { |severity, datetime, progname, msg|
-        "DCI-#{severity} :: #{msg}
"
-    }
-    return logger
-end
\ No newline at end of file
+    warn "Please use DCILogger.instance instead"
+    return DCILogger.instance
+end

-- 
ci-tooling packaging