Catch the TimeoutException in the search command.

Undeterministically generates a harmless error message from Akka in the console (akka/akka-http#497). Future work: disable this message.

Author: sideresearch

src/main/scala/de/upb/cs/swt/delphi/cli/Config.scala

@@ -33,6 +33,7 @@ case class Config(server: String = sys.env.getOrElse("DELPHI_SERVER", "https://d
                   query : String = "",
                   limit : Option[Int] = None,
                   id : String = "",
+                  timeout : Int = 10,
                   args: List[String] = List(),
                   opts: List[String] = List()) {
 

src/main/scala/de/upb/cs/swt/delphi/cli/DelphiCLI.scala

@@ -53,18 +53,19 @@ object DelphiCLI extends App {
         .text("Retrieve a project's description, specified by ID.")
         .children(
           arg[String]("id").action((x, c) => c.copy(id = x)).text("The ID of the project to retrieve"),
+          opt[String]("csv").action((x, c) => c.copy(csv = x)).text("Path to the output .csv file (overwrites existing file)"),
           opt[Unit]('f', "file").action((_, c) => c.copy(opts = List("file"))).text("Use to load the ID from file, " +
-            "with the filepath given in place of the ID"),
-          opt[String]("csv").action((x, c) => c.copy(csv = x)).text("Path to the output .csv file (overwrites existing file)")
+            "with the filepath given in place of the ID")
         )
 
       cmd("search").action((s, c) => c.copy(mode = "search"))
         .text("Search artifact using a query.")
         .children(
           arg[String]("query").action((x,c) => c.copy(query = x)).text("The query to be used."),
+          opt[String]("csv").action((x, c) => c.copy(csv = x)).text("Path to the output .csv file (overwrites existing file)"),
           opt[Int]("limit").action((x, c) => c.copy(limit = Some(x))).text("The maximal number of results returned."),
           opt[Unit](name="list").action((_, c) => c.copy(list = true)).text("Output results as list (raw option overrides this)"),
-          opt[String]("csv").action((x, c) => c.copy(csv = x)).text("Path to the output .csv file (overwrites existing file)")
+          opt[Int]("timeout").action((x, c) => c.copy(timeout = x)).text("Timeout in seconds.")
         )
     }
   }

src/main/scala/de/upb/cs/swt/delphi/cli/commands/SearchCommand.scala

@@ -16,6 +16,7 @@
 
 package de.upb.cs.swt.delphi.cli.commands
 
+import java.util.concurrent.TimeoutException
 import java.util.concurrent.TimeUnit
 
 import akka.actor.ActorSystem
@@ -29,7 +30,6 @@ import akka.util.ByteString
 import de.upb.cs.swt.delphi.cli.Config
 import de.upb.cs.swt.delphi.cli.artifacts.SearchResult
 import de.upb.cs.swt.delphi.cli.artifacts.SearchResultJson._
-import de.upb.cs.swt.delphi.cli.commands.RetrieveCommand.information
 import spray.json.DefaultJsonProtocol
 
 import scala.concurrent.duration._
@@ -59,40 +59,48 @@ object SearchCommand extends Command with SprayJsonSupport with DefaultJsonProto
       Http().singleRequest(HttpRequest(uri = searchUri, method = HttpMethods.POST, entity = entity))
     }
 
-    val response = Await.result(responseFuture, 10 seconds)
-    val resultFuture: Future[String] = response match {
-      case HttpResponse(StatusCodes.OK, headers, entity, _) =>
-        entity.dataBytes.runFold(ByteString(""))(_ ++ _).map { body =>
-          body.utf8String
+    try {
+      val response = Await.result(responseFuture, Duration(config.timeout + " seconds"))
+      val resultFuture: Future[String] = response match {
+        case HttpResponse(StatusCodes.OK, headers, entity, _) =>
+          entity.dataBytes.runFold(ByteString(""))(_ ++ _).map { body =>
+            body.utf8String
+          }
+        case resp@HttpResponse(code, _, _, _) => {
+          error(config)("Request failed, response code: " + code)
+          resp.discardEntityBytes()
+          Future("")
         }
-      case resp@HttpResponse(code, _, _, _) => {
-        error(config)("Request failed, response code: " + code)
-        resp.discardEntityBytes()
-        Future("")
       }
-    }
-
-    val result = Await.result(resultFuture, Duration.Inf)
 
-    val took = (System.nanoTime() - start).nanos.toUnit(TimeUnit.SECONDS)
+      val result = Await.result(resultFuture, Duration.Inf)
 
-    if (config.raw || result.equals("")) {
-      reportResult(config)(result)
-    }
+      val took = (System.nanoTime() - start).nanos.toUnit(TimeUnit.SECONDS)
 
-    if(!(config.raw || result.equals("")) || !config.csv.equals("")) {
-      val unmarshalledFuture = Unmarshal(result).to[List[SearchResult]]
+      if (config.raw || result.equals("")) {
+        reportResult(config)(result)
+      }
 
-      val processFuture = unmarshalledFuture.transform {
-        case Success(unmarshalled) => {
-          processResults(config, unmarshalled, took)
-          Success(unmarshalled)
-        }
-        case Failure(e) => {
-          error(config)(result)
-          Failure(e)
+      if(!(config.raw || result.equals("")) || !config.csv.equals("")) {
+        val unmarshalledFuture = Unmarshal(result).to[List[SearchResult]]
+
+        val processFuture = unmarshalledFuture.transform {
+          case Success(unmarshalled) => {
+            processResults(config, unmarshalled, took)
+            Success(unmarshalled)
+          }
+          case Failure(e) => {
+            error(config)(result)
+            Failure(e)
+          }
         }
       }
+    } catch {
+      case e : TimeoutException => {
+        error(config)("The query timed out after " + (System.nanoTime() - start).nanos.toUnit(TimeUnit.SECONDS) +
+          " seconds. To set a longer timeout, use the --timeout option.")
+        Failure(e)
+      }
     }
   }