aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/scala/org/apache
diff options
context:
space:
mode:
authorfelixcheung <felixcheung_m@hotmail.com>2016-04-24 22:51:18 -0700
committerDavies Liu <davies.liu@gmail.com>2016-04-24 22:51:18 -0700
commitc752b6c5ec488b87c3aaaa86902dd4da9b4b406f (patch)
tree658c80174a839a732299be232807f51f48f85362 /core/src/main/scala/org/apache
parent6ab4d9e0c76b69b4d6d5f39037a77bdfb042be19 (diff)
downloadspark-c752b6c5ec488b87c3aaaa86902dd4da9b4b406f.tar.gz
spark-c752b6c5ec488b87c3aaaa86902dd4da9b4b406f.tar.bz2
spark-c752b6c5ec488b87c3aaaa86902dd4da9b4b406f.zip
[SPARK-14881] [PYTHON] [SPARKR] pyspark and sparkR shell default log level should match spark-shell/Scala
## What changes were proposed in this pull request? Change default logging to WARN for pyspark shell and sparkR shell for a much cleaner environment. ## How was this patch tested? Manually running pyspark and sparkR shell Author: felixcheung <felixcheung_m@hotmail.com> Closes #12648 from felixcheung/pylogging.
Diffstat (limited to 'core/src/main/scala/org/apache')
-rw-r--r--core/src/main/scala/org/apache/spark/api/python/PythonGatewayServer.scala2
-rw-r--r--core/src/main/scala/org/apache/spark/api/r/RBackend.scala3
2 files changed, 5 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/api/python/PythonGatewayServer.scala b/core/src/main/scala/org/apache/spark/api/python/PythonGatewayServer.scala
index 6c40722725..11f2432575 100644
--- a/core/src/main/scala/org/apache/spark/api/python/PythonGatewayServer.scala
+++ b/core/src/main/scala/org/apache/spark/api/python/PythonGatewayServer.scala
@@ -32,6 +32,8 @@ import org.apache.spark.util.Utils
* This process is launched (via SparkSubmit) by the PySpark driver (see java_gateway.py).
*/
private[spark] object PythonGatewayServer extends Logging {
+ initializeLogIfNecessary(true)
+
def main(args: Array[String]): Unit = Utils.tryOrExit {
// Start a GatewayServer on an ephemeral port
val gatewayServer: GatewayServer = new GatewayServer(null, 0)
diff --git a/core/src/main/scala/org/apache/spark/api/r/RBackend.scala b/core/src/main/scala/org/apache/spark/api/r/RBackend.scala
index 9d29a84413..41d0a85ee3 100644
--- a/core/src/main/scala/org/apache/spark/api/r/RBackend.scala
+++ b/core/src/main/scala/org/apache/spark/api/r/RBackend.scala
@@ -94,6 +94,8 @@ private[spark] class RBackend {
}
private[spark] object RBackend extends Logging {
+ initializeLogIfNecessary(true)
+
def main(args: Array[String]): Unit = {
if (args.length < 1) {
// scalastyle:off println
@@ -101,6 +103,7 @@ private[spark] object RBackend extends Logging {
// scalastyle:on println
System.exit(-1)
}
+
val sparkRBackend = new RBackend()
try {
// bind to random port