From 52b26d2f8cebbe933ffe7508fb71b9d580c1e0c6 Mon Sep 17 00:00:00 2001 From: Stephane Landelle Date: Wed, 25 Jul 2012 20:35:09 +0200 Subject: [PATCH] Make sure -ro argument point to a valid directory, close #612 --- .../ebi/gatling/charts/result/reader/FileDataReader.scala | 6 +++--- .../com/excilys/ebi/gatling/core/config/GatlingFiles.scala | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gatling-charts/src/main/scala/com/excilys/ebi/gatling/charts/result/reader/FileDataReader.scala b/gatling-charts/src/main/scala/com/excilys/ebi/gatling/charts/result/reader/FileDataReader.scala index 2e3c647f36..59d862a8dc 100644 --- a/gatling-charts/src/main/scala/com/excilys/ebi/gatling/charts/result/reader/FileDataReader.scala +++ b/gatling-charts/src/main/scala/com/excilys/ebi/gatling/charts/result/reader/FileDataReader.scala @@ -79,7 +79,7 @@ class FileDataReader(runUuid: String) extends DataReader(runUuid) with Logging { } } - simulationLogDirectory(runUuid).toDirectory.files.filter(_.jfile.getName.matches(FileDataReader.SIMULATION_FILES_NAME_PATTERN)).foreach(readFile(_)) + simulationLogDirectory(runUuid, false).files.filter(_.jfile.getName.matches(FileDataReader.SIMULATION_FILES_NAME_PATTERN)).foreach(readFile(_)) val sortedRequestNames = requestNames.toSeq.sortBy(_._2).map(_._1) val sortedScenarioNames = scenarioNames.toSeq.sortBy(_._2).map(_._1) @@ -109,8 +109,8 @@ class FileDataReader(runUuid: String) extends DataReader(runUuid) with Logging { def meanResponseTime(status: Option[RequestStatus], requestName: Option[String]): Long = StatisticsHelper.meanResponseTime(requestRecords, status, requestName) def meanLatency(status: Option[RequestStatus], requestName: Option[String]): Long = StatisticsHelper.meanLatency(requestRecords, status, requestName) - - def meanNumberOfRequestsPerSecond(status: Option[RequestStatus], requestName: Option[String]) : Long = StatisticsHelper.meanNumberOfRequestsPerSecond(requestRecords, status, requestName) + + def meanNumberOfRequestsPerSecond(status: Option[RequestStatus], requestName: Option[String]): Long = StatisticsHelper.meanNumberOfRequestsPerSecond(requestRecords, status, requestName) def responseTimeStandardDeviation(status: Option[RequestStatus] = None, requestName: Option[String] = None): Long = StatisticsHelper.responseTimeStandardDeviation(requestRecords, status, requestName): Long diff --git a/gatling-core/src/main/scala/com/excilys/ebi/gatling/core/config/GatlingFiles.scala b/gatling-core/src/main/scala/com/excilys/ebi/gatling/core/config/GatlingFiles.scala index 657d9e094d..7e01e77e56 100644 --- a/gatling-core/src/main/scala/com/excilys/ebi/gatling/core/config/GatlingFiles.scala +++ b/gatling-core/src/main/scala/com/excilys/ebi/gatling/core/config/GatlingFiles.scala @@ -40,8 +40,11 @@ object GatlingFiles { def jsFolder(runUuid: String): Path = resultFolder(runUuid) / GATLING_JS def styleFolder(runUuid: String): Path = resultFolder(runUuid) / GATLING_STYLE def rawDataFolder(runUuid: String): Path = resultFolder(runUuid) / "rawdata" - def simulationLogDirectory(runUuid: String): Directory = { + def simulationLogDirectory(runUuid: String, create: Boolean = true): Directory = { val dir = resultFolder(runUuid) - dir.createDirectory() + if (create) dir.createDirectory() + else if (!dir.exists) throw new IllegalArgumentException("simulation directory '" + dir + "' doesn't exist") + else if (!dir.isDirectory) throw new IllegalArgumentException("simulation directory '" + dir + "' is not a directory") + else dir.toDirectory } } \ No newline at end of file