From ddf811a589f8489b75e94b58ee40274e8766ba99 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 21 Jan 2017 12:37:11 +0100
Subject: [PATCH] Make logger types public

This commit makes the logging functionality types from libimagrt public,
so the libimagruby implementation can re-use the ImagLogger type.
---
 libimagrt/src/lib.rs    |  2 +-
 libimagrt/src/logger.rs | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/libimagrt/src/lib.rs b/libimagrt/src/lib.rs
index 13c004ba..82556612 100644
--- a/libimagrt/src/lib.rs
+++ b/libimagrt/src/lib.rs
@@ -49,9 +49,9 @@ extern crate libimagutil;
 #[macro_use] extern crate libimagerror;
 
 mod configuration;
-mod logger;
 
 pub mod error;
+pub mod logger;
 pub mod runtime;
 pub mod setup;
 
diff --git a/libimagrt/src/logger.rs b/libimagrt/src/logger.rs
index 2e6244f8..9881aa08 100644
--- a/libimagrt/src/logger.rs
+++ b/libimagrt/src/logger.rs
@@ -27,6 +27,7 @@ use ansi_term::Colour;
 use ansi_term::ANSIString;
 
 pub struct ImagLogger {
+    prefix: String,
     lvl: LogLevel,
     color_enabled: bool,
 }
@@ -35,11 +36,17 @@ impl ImagLogger {
 
     pub fn new(lvl: LogLevel) -> ImagLogger {
         ImagLogger {
+            prefix: "[imag]".to_owned(),
             lvl: lvl,
             color_enabled: true
         }
     }
 
+    pub fn with_prefix(mut self, pref: String) -> ImagLogger {
+        self.prefix = pref;
+        self
+    }
+
     pub fn with_color(mut self, b: bool) -> ImagLogger {
         self.color_enabled = b;
         self
@@ -84,22 +91,22 @@ impl Log for ImagLogger {
                     let ln   = self.color_or_not(Cyan, format!("{}", loc.line()));
                     let args = self.color_or_not(Cyan, format!("{}", record.args()));
 
-                    writeln!(stderr(), "[imag][{: <5}][{}][{: >5}]: {}", lvl, file, ln, args).ok();
+                    writeln!(stderr(), "{}[{: <5}][{}][{: >5}]: {}", self.prefix, lvl, file, ln, args).ok();
                 },
                 LogLevel::Warn | LogLevel::Error => {
                     let lvl  = self.style_or_not(Red.blink(), format!("{}", record.level()));
                     let args = self.color_or_not(Red, format!("{}", record.args()));
 
-                    writeln!(stderr(), "[imag][{: <5}]: {}", lvl, args).ok();
+                    writeln!(stderr(), "{}[{: <5}]: {}", self.prefix, lvl, args).ok();
                 },
                 LogLevel::Info => {
                     let lvl  = self.color_or_not(Yellow, format!("{}", record.level()));
                     let args = self.color_or_not(Yellow, format!("{}", record.args()));
 
-                    writeln!(stderr(), "[imag][{: <5}]: {}", lvl, args).ok();
+                    writeln!(stderr(), "{}[{: <5}]: {}", self.prefix, lvl, args).ok();
                 },
                 _ => {
-                    writeln!(stderr(), "[imag][{: <5}]: {}", record.level(), record.args()).ok();
+                    writeln!(stderr(), "{}[{: <5}]: {}", self.prefix, record.level(), record.args()).ok();
                 },
             }
         }