You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/11/10 15:23:52 UTC

[10/50] [abbrv] incubator-usergrid git commit: change default simulation

change default simulation


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/00d8347b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/00d8347b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/00d8347b

Branch: refs/heads/two-dot-o-events
Commit: 00d8347b9cacd97d78e664b5bde520e7d757dc67
Parents: 7d0cd3b
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Nov 6 08:27:21 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Nov 6 08:27:21 2014 -0700

----------------------------------------------------------------------
 .../main/scala/org/apache/usergrid/settings/Settings.scala    | 7 ++++++-
 stack/loadtests/src/test/scala/Engine.scala                   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00d8347b/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
index 90dd41d..30cd4ab 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
@@ -33,7 +33,8 @@ object Settings {
   val httpConf = http.baseURL(baseAppUrl)
 
   // Simulation settings
-  val numUsers:Int = Integer.getInteger("numUsers", 10).toInt
+  var numUsers:Int = Integer.getInteger("numUsers", 10).toInt
+
   val numEntities:Int = Integer.getInteger("numEntities", 5000).toInt
   val numDevices:Int = Integer.getInteger("numDevices", 2000).toInt
 
@@ -41,6 +42,10 @@ object Settings {
   val duration:Int = Integer.getInteger("duration", 300).toInt // in seconds
   val throttle:Int = Integer.getInteger("throttle", 50).toInt // in seconds
 
+  if(numUsers<duration){
+    println(s"Changing numUsers $numUsers to duration length $duration")
+    numUsers = duration
+  }
   // Geolocation settings
   val centerLatitude:Double = 37.442348 // latitude of center point
   val centerLongitude:Double = -122.138268 // longitude of center point

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00d8347b/stack/loadtests/src/test/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/test/scala/Engine.scala b/stack/loadtests/src/test/scala/Engine.scala
index 00f1004..543674a 100644
--- a/stack/loadtests/src/test/scala/Engine.scala
+++ b/stack/loadtests/src/test/scala/Engine.scala
@@ -26,7 +26,7 @@ object Engine extends App {
 	props.requestBodiesDirectory(IDEPathHelper.requestBodiesDirectory.toString)
 	props.binariesDirectory(IDEPathHelper.mavenBinariesDirectory.toString)
 
-  props.simulationClass("org.apache.usergrid.simulations.PushNotificationTargetUserSimulation")
+  props.simulationClass("org.apache.usergrid.simulations.AppSimulation")
 
 	Gatling.fromMap(props.build)
 }