Skip to content

Commit f8531e7

Browse files
author
Lenny Halseth
committed
Work-around (non-ideal) for handling error in processing stage.
1 parent f8977d9 commit f8531e7

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

codepulse/src/main/scala/com/secdec/codepulse/tracer/ProjectFileUploadHandler.scala

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ package com.secdec.codepulse.tracer
2222
import java.io.File
2323
import net.liftweb.http.BadResponse
2424
import net.liftweb.http.LiftResponse
25+
import net.liftweb.http.RedirectWithState
26+
import net.liftweb.http.RedirectState
2527
import net.liftweb.http.LiftRules
2628
import net.liftweb.http.NotFoundResponse
2729
import net.liftweb.http.OkResponse
@@ -68,7 +70,13 @@ class ProjectFileUploadHandler(projectManager: ProjectManager) extends RestHelpe
6870
_.projectData.metadata.name = name
6971
}
7072

71-
hrefResponse(projectId)
73+
projectManager.getProject(projectId) match {
74+
case None =>
75+
// failed processing for some reason
76+
NotFoundResponse("There was an unknown error processing your data.")
77+
case Some(_) =>
78+
hrefResponse(projectId)
79+
}
7280
}
7381
}
7482

@@ -124,7 +132,10 @@ class ProjectFileUploadHandler(projectManager: ProjectManager) extends RestHelpe
124132

125133
def fallbackResponse(box: Box[LiftResponse]) = box match {
126134
case Full(resp) => resp
127-
case Empty => NotFoundResponse("an unknown error occurred")
128-
case Failure(msg, _, _) => NotFoundResponse(msg)
135+
case _ => {
136+
RedirectWithState("/", RedirectState(() => NotFoundResponse("An error occurred while processing data.")))
137+
}
138+
// case Empty => NotFoundResponse("an unknown error occurred")
139+
// case Failure(msg, _, _) => {NotFoundResponse(msg)
129140
}
130141
}

0 commit comments

Comments
 (0)