Skip to content

Commit

Permalink
Make sure -ro argument point to a valid directory, close #612
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephane Landelle committed Jul 25, 2012
1 parent cbfa165 commit 52b26d2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down
Expand Up @@ -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
}
}

0 comments on commit 52b26d2

Please sign in to comment.