Added concurrency option

Author: Ryo-Natori

src/main/scala/com/github/zabbicook/api/ZabbixApi.scala

@@ -23,11 +23,11 @@ class ZabbixApi(conf: ZabbixApiConf) extends Logging {
   private[this] val sequence = new Random
 
   private[this] val throttle: Throttle = {
-    if (conf.interval.isZero) {
+    if (conf.concurrency && conf.interval.isZero) {
       NonStrictThrottle
     } else {
       new StrictThrottle(
-        concurrency = 1,
+        concurrency = if (conf.concurrency) 10 else 1,
         timeout = conf.timeout.multipliedBy(3),
         startInterval = conf.interval
       )

src/main/scala/com/github/zabbicook/api/ZabbixApiConf.scala

@@ -12,6 +12,7 @@ import scala.concurrent.ExecutionContext
   * @param authUser admin user
   * @param authPass admin password
   * @param interval interval of calling api
+  * @param concurrency flag of concurrency
   * @param executionContext execution context
   */
 case class ZabbixApiConf(
@@ -20,6 +21,7 @@ case class ZabbixApiConf(
   authUser: String,
   authPass: String,
   interval: Duration,
+  concurrency: Boolean,
   executionContext: ExecutionContext = ExecutionContext.global,
   timeout: Duration = Duration.ofSeconds(20)
 ) {

src/main/scala/com/github/zabbicook/cli/Arguments.scala

@@ -16,7 +16,8 @@ case class Arguments(
   showDoc: Boolean = false,
   docDepth: Int = Int.MaxValue,
   docRoot: String = "",
-  apiInterval: Duration = Duration.ZERO
+  apiInterval: Duration = Duration.ZERO,
+  apiConcurrency: Boolean = false
 )
 
 object Arguments {
@@ -72,12 +73,18 @@ object Arguments {
       .action((x, c) => c.copy(docRoot = x))
       .text("The root of the tree displayed by '--doc'.")
 
-    opt[Int]('s', "sleep").optional()
+    opt[Int]("interval").optional()
       .valueName("<interval msec>")
       .action((x, c) => c.copy(apiInterval = Duration.ofMillis(Math.min(Math.max(x, 0), 1000))))
       .text("Specify the interval of calling zabbix api in milliseconds. The default is 0 and maximum value is 1000" + "" +
         " If you do not want to load the zabbix server and database, set the interval.")
 
+    opt[Int]('c', "concurrency").optional()
+      .action((_, c) => c.copy(apiConcurrency = true))
+      .text("By default, calling Zabbix api is serialized. When set this option, optimized for concurrent api operations." +
+        " If you do not want to stress the server, leave it as default.")
+
+
     opt[Unit]('d', "debug").optional()
       .action((_, c) => c.copy(isDebug = true))
       .text("Enables debug logging.")

src/main/scala/com/github/zabbicook/cli/Runner.scala

@@ -22,7 +22,8 @@ class Runner(conf: Arguments) extends Logging {
     apiPath = conf.url.toString,
     authUser = conf.user,
     authPass = conf.pass,
-    interval = conf.apiInterval
+    interval = conf.apiInterval,
+    concurrency = conf.apiConcurrency
   )
 
   def run(): Future[RunResult] = {

src/test/scala/com/github/zabbicook/test/TestConfig.scala

@@ -23,21 +23,23 @@ trait TestConfig {
 
 object TestConfig {
   // to avoid 'DBEXECUTE_ERROR' on travis.ci (experimental)
-  val sleep: Duration = Duration.ofMillis(System.getProperty("sleep", "100").toInt)
+  val sleep: Duration = Duration.ofMillis(System.getProperty("sleep", "0").toInt)
   println(s"sleep: ${sleep.toMillis} msec")
 
   val apiConfs: Map[Version, ZabbixApiConf] = Map(
     Version(3,0,5) -> ZabbixApiConf(
       apiPath = "http://localhost:8080/api_jsonrpc.php",
       authUser = "Admin",
       authPass = "zabbix",
-      interval = sleep
+      interval = sleep,
+      concurrency = false
     ),
     Version(3,2,1) -> ZabbixApiConf(
       apiPath = "http://localhost:8081/api_jsonrpc.php",
       authUser = "Admin",
       authPass = "zabbix",
-      interval = sleep
+      interval = sleep,
+      concurrency = false
     )
   )
 }