ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #215 from dennybritz/dev

Browse source 
HTTP File server fixes
This commit is contained in:
Matei Zaharia 2012-09-21 17:39:28 -07:00
parent 6d28dde370 afb7ccc838
commit 33fb373e69
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/scala/spark/HttpFileServer.scala
View file

@ -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 = {