Merge pull request #7 from briantopping/6

Issue 6: Don't clobber existing logger.
monix · Dec 17, 2015 · c081b4b · c081b4b
2 parents 021b255 + 6aafc74
commit c081b4b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/scala/shade/memcached/MemcachedImpl.scala b/src/main/scala/shade/memcached/MemcachedImpl.scala
@@ -251,8 +251,10 @@ class MemcachedImpl(config: Configuration, ec: ExecutionContext) extends Memcach
 
   private[this] val prefix = config.keysPrefix.getOrElse("")
   private[this] val instance = {
-    System.setProperty("net.spy.log.LoggerImpl",
-      "shade.memcached.internals.Slf4jLogger")
+    if (System.getProperty("net.spy.log.LoggerImpl") == null) {
+      System.setProperty("net.spy.log.LoggerImpl",
+        "shade.memcached.internals.Slf4jLogger")
+    }
 
     val conn = {
       val builder = new ConnectionFactoryBuilder()