diff --git a/logger/log.go b/logger/log.go
index 63db0499..a07006b7 100644
--- a/logger/log.go
+++ b/logger/log.go
@@ -1,4 +1,4 @@
-// Copyright 2012-2014 Apcera Inc. All rights reserved.
+// Copyright 2012-2015 Apcera Inc. All rights reserved.
 package logger
 
 import (
diff --git a/server/log.go b/server/log.go
index e1dc1266..00e8c665 100644
--- a/server/log.go
+++ b/server/log.go
@@ -1,4 +1,4 @@
-// Copyright 2012-2014 Apcera Inc. All rights reserved.
+// Copyright 2012-2015 Apcera Inc. All rights reserved.
 
 package server
 
@@ -7,11 +7,13 @@ import (
 	"sync/atomic"
 )
 
+// Package globals for performance checks
 var trace int32
 var debug int32
+
 var log = struct {
-	logger Logger
 	sync.Mutex
+	logger Logger
 }{}
 
 type Logger interface {
@@ -22,18 +24,18 @@ type Logger interface {
 	Tracef(format string, v ...interface{})
 }
 
-func (s *Server) SetLogger(logger Logger, d, t bool) {
-	if d {
+func (s *Server) SetLogger(logger Logger, debugFlag, traceFlag bool) {
+	if debugFlag {
 		atomic.StoreInt32(&debug, 1)
 	}
 
-	if t {
+	if traceFlag {
 		atomic.StoreInt32(&trace, 1)
 	}
 
 	log.Lock()
-	defer log.Unlock()
 	log.logger = logger
+	log.Unlock()
 }
 
 func Noticef(format string, v ...interface{}) {