diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-04-22 14:13:56 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-04-22 14:14:03 +0530 |
| commit | 185bb9525a3a48313cd5e446e1b80d2d697465d8 (patch) | |
| tree | bdbab31c488d6140973ef99d93cc8ff959cad50f /repl/src | |
| parent | 4b57f83209b94f87890ef307af45fa493e7fdba8 (diff) | |
| parent | 17e076de800ea0d4c55f2bd657348641f6f9c55b (diff) | |
| download | spark-185bb9525a3a48313cd5e446e1b80d2d697465d8.tar.gz spark-185bb9525a3a48313cd5e446e1b80d2d697465d8.tar.bz2 spark-185bb9525a3a48313cd5e446e1b80d2d697465d8.zip | |
Manually merged scala-2.10 and master
Diffstat (limited to 'repl/src')
| -rw-r--r-- | repl/src/main/scala/spark/repl/SparkILoop.scala | 17 | ||||
| -rw-r--r-- | repl/src/test/resources/log4j.properties | 4 |
2 files changed, 18 insertions, 3 deletions
diff --git a/repl/src/main/scala/spark/repl/SparkILoop.scala b/repl/src/main/scala/spark/repl/SparkILoop.scala index 5a1e54c929..e83e403760 100644 --- a/repl/src/main/scala/spark/repl/SparkILoop.scala +++ b/repl/src/main/scala/spark/repl/SparkILoop.scala @@ -152,7 +152,7 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter, finally in = saved } - + def sparkCleanUp(){ echo("Stopping spark context.") intp.beQuietDuring { @@ -222,6 +222,21 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter, } } + /** Print a welcome message */ + def printWelcome() { + echo("""Welcome to + ____ __ + / __/__ ___ _____/ /__ + _\ \/ _ \/ _ `/ __/ '_/ + /___/ .__/\_,_/_/ /_/\_\ version 0.8.0 + /_/ +""") + import Properties._ + val welcomeMsg = "Using Scala %s (%s, Java %s)".format( + versionString, javaVmName, javaVersion) + echo(welcomeMsg) + } + /** Show the history */ lazy val historyCommand = new LoopCommand("history", "show the history (optional num is commands to show)") { override def usage = "[num]" diff --git a/repl/src/test/resources/log4j.properties b/repl/src/test/resources/log4j.properties index 4c99e450bc..cfb1a390e6 100644 --- a/repl/src/test/resources/log4j.properties +++ b/repl/src/test/resources/log4j.properties @@ -1,8 +1,8 @@ -# Set everything to be logged to the console +# Set everything to be logged to the repl/target/unit-tests.log log4j.rootCategory=INFO, file log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file.append=false -log4j.appender.file.file=spark-tests.log +log4j.appender.file.file=repl/target/unit-tests.log log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss.SSS} %p %c{1}: %m%n |