Repository: spark
Updated Branches:
  refs/heads/branch-1.0 82ceda250 -> 69e2726d4


Nicer logging for SecurityManager startup

Happy to open a jira ticket if you'd like to track one there.

Author: Andrew Ash <[email protected]>

Closes #678 from ash211/SecurityManagerLogging and squashes the following 
commits:

2aa0b7a [Andrew Ash] Nicer logging for SecurityManager startup

(cherry picked from commit 7f6f4a1035ae0c9fa2029fe991f621ca263d53e0)
Signed-off-by: Reynold Xin <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/69e2726d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/69e2726d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/69e2726d

Branch: refs/heads/branch-1.0
Commit: 69e2726d4c3ede4bed1a3accd60ed9807074282d
Parents: 82ceda2
Author: Andrew Ash <[email protected]>
Authored: Wed May 7 17:24:12 2014 -0400
Committer: Reynold Xin <[email protected]>
Committed: Wed May 7 17:24:21 2014 -0400

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/SecurityManager.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/69e2726d/core/src/main/scala/org/apache/spark/SecurityManager.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SecurityManager.scala 
b/core/src/main/scala/org/apache/spark/SecurityManager.scala
index b4b0067..74aa441 100644
--- a/core/src/main/scala/org/apache/spark/SecurityManager.scala
+++ b/core/src/main/scala/org/apache/spark/SecurityManager.scala
@@ -146,8 +146,9 @@ private[spark] class SecurityManager(sparkConf: SparkConf) 
extends Logging {
   setViewAcls(defaultAclUsers, sparkConf.get("spark.ui.view.acls", ""))
 
   private val secretKey = generateSecretKey()
-  logInfo("SecurityManager, is authentication enabled: " + authOn +
-    " are ui acls enabled: " + uiAclsOn + " users with view permissions: " + 
viewAcls.toString())
+  logInfo("SecurityManager: authentication " + (if (authOn) "enabled" else 
"disabled") +
+    "; ui acls " + (if (uiAclsOn) "enabled" else "disabled") +
+    "; users with view permissions: " + viewAcls.toString())
 
   // Set our own authenticator to properly negotiate user/password for HTTP 
connections.
   // This is needed by the HTTP client fetching from the HttpServer. Put here 
so its

Reply via email to