diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-09-21 17:39:28 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-09-21 17:39:28 -0700 |
| commit | 33fb373e69b5cd437257d5260fb90db7bcec8285 (patch) | |
| tree | cfd387651f84d1fc3dbdbf03079374a78ee39e45 | |
| parent | 6d28dde37041a7794e4da17bb92ca387e693a96a (diff) | |
| parent | afb7ccc83820be287abbd6328b3294367fab2c72 (diff) | |
| download | spark-33fb373e69b5cd437257d5260fb90db7bcec8285.tar.gz spark-33fb373e69b5cd437257d5260fb90db7bcec8285.tar.bz2 spark-33fb373e69b5cd437257d5260fb90db7bcec8285.zip | |
Merge pull request #215 from dennybritz/dev
HTTP File server fixes
| -rw-r--r-- | core/src/main/scala/spark/HttpFileServer.scala | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/src/main/scala/spark/HttpFileServer.scala b/core/src/main/scala/spark/HttpFileServer.scala index e6ad4dd28e..05ca846c85 100644 --- a/core/src/main/scala/spark/HttpFileServer.scala +++ b/core/src/main/scala/spark/HttpFileServer.scala @@ -20,7 +20,7 @@ class HttpFileServer extends Logging { fileDir.mkdir() jarDir.mkdir() logInfo("HTTP File server directory is " + baseDir) - httpServer = new HttpServer(fileDir) + httpServer = new HttpServer(baseDir) httpServer.start() serverUri = httpServer.uri } @@ -30,11 +30,13 @@ class HttpFileServer extends Logging { } def addFile(file: File) : String = { - return addFileToDir(file, fileDir) + addFileToDir(file, fileDir) + return serverUri + "/files/" + file.getName } def addJar(file: File) : String = { - return addFileToDir(file, jarDir) + addFileToDir(file, jarDir) + return serverUri + "/jars/" + file.getName } def addFileToDir(file: File, dir: File) : String = { |