Silently load nested configurations.

realm · Dec 28, 2015 · d8c418e · d8c418e
1 parent 0bf09ef
commit d8c418e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Source/SwiftLintFramework/Extensions/QueuedPrint.swift b/Source/SwiftLintFramework/Extensions/QueuedPrint.swift
@@ -34,9 +34,12 @@ public func queuedPrint<T>(object: T) {
 A thread-safe, newline-terminated version of fputs(..., stderr).
 
 - parameter string: String to print.
+- parameter silent: True suppresses output
 */
-public func queuedPrintError(string: String) {
-    dispatch_async(outputQueue) {
-        fputs(string + "\n", stderr)
+public func queuedPrintError(string: String, silent: Bool = false) {
+    if !silent {
+        dispatch_async(outputQueue) {
+            fputs(string + "\n", stderr)
+        }
     }
 }
diff --git a/Source/SwiftLintFramework/Models/Configuration.swift b/Source/SwiftLintFramework/Models/Configuration.swift
@@ -137,7 +137,7 @@ public struct Configuration {
             let yamlContents = try NSString(contentsOfFile: fullPath,
                 encoding: NSUTF8StringEncoding) as String
             if let yamlConfig = Configuration.loadYaml(yamlContents) {
-                queuedPrintError("Loading configuration from '\(path)'")
+                queuedPrintError("Loading configuration from '\(path)'", silent: silent)
                 self.init(yamlConfig: yamlConfig)!
                 configPath = fullPath
                 return
@@ -225,7 +225,7 @@ extension Configuration {
         // If a config exists and it isn't us, load and merge the configs
         if configSearchPath != configPath &&
             NSFileManager.defaultManager().fileExistsAtPath(configSearchPath) {
-            return merge(Configuration(path: configSearchPath, optional: false))
+            return merge(Configuration(path: configSearchPath, optional: false, silent: true))
         }
 
         // If we are not at the root path, continue down the tree