Merge pull request #1068 from ninoseki/split-parallel

ninoseki · Mar 2, 2024 · 43838b6 · 43838b6
2 parents ca1c27b + 0d46fe8
commit 43838b6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/docs/analyzers/index.md b/docs/analyzers/index.md
@@ -97,7 +97,7 @@ queries:
 
 ### Parallel
 
-`parallel` (`bool`) controls whether to allow parallel execution or not. Optional. Defaults to `false`. Configurable via `PARALLEL` environment variable.
+`parallel` (`bool`) controls whether to allow parallel execution or not. Optional. Defaults to `false`. Configurable via `ANALYZER_PARALLELISM` environment variable.
 
 ### Pagination Interval
 

diff --git a/docs/configuration.md b/docs/configuration.md
@@ -44,10 +44,11 @@ Alternatively you can set values through `.env` file. Values in `.env` file will
 
 | Environment Variable      | Type    | Description                               | Default |
 | ------------------------- | ------- | ----------------------------------------- | ------- |
+| ANALYZER_PARALLELISM      | Boolean | Whether to run analyzers in parallel      | `false` |
+| EMITTER_PARALLELISM       | Boolean | Whether to run emitters in parallel       | `true`  |
 | IGNORE_ERROR              | Boolean | Whether to ignore error while querying    | `false` |
 | PAGINATION_INTERVAL       | Integer | Pagination interval                       | `0`     |
 | PAGINATION_LIMIT          | Integer | Pagination limit                          | `100`   |
-| PARALLEL                  | Boolean | Whether to run queries in parallel        | `false` |
 | RETRY_EXPONENTIAL_BACKOFF | Boolean | Whether to use retry exponential back off | `true`  |
 | RETRY_INTERVAL            | Integer | Retry interval                            | `5`     |
 | RETRY_TIMES               | Integer | Retry times                               | `3`     |

diff --git a/docs/emitters/index.md b/docs/emitters/index.md
@@ -38,4 +38,4 @@ options:
 
 ### Parallel
 
-`parallel` (`bool`) controls whether to allow parallel execution or not. Optional. Defaults to `false`. Configurable via `PARALLEL` environment variable.
+`parallel` (`bool`) controls whether to allow parallel execution or not. Optional. Defaults to `true`. Configurable via `EMITTER_PARALLELISM` environment variable.
diff --git a/lib/mihari/analyzers/base.rb b/lib/mihari/analyzers/base.rb
@@ -44,7 +44,7 @@ def ignore_error?
       # @return [Boolean]
       #
       def parallel?
-        options[:parallel] || Mihari.config.parallel
+        options[:parallel] || Mihari.config.analyzer_parallelism
       end
 
       # @return [Array<String>, Array<Mihari::Models::Artifact>]

diff --git a/lib/mihari/config.rb b/lib/mihari/config.rb
@@ -42,7 +42,8 @@ class Config < Anyway::Config
       ignore_error: false,
       pagination_interval: 0,
       pagination_limit: 100,
-      parallel: false,
+      analyzer_parallelism: false,
+      emitter_parallelism: true,
       retry_exponential_backoff: true,
       retry_interval: 5,
       retry_times: 3,
@@ -146,7 +147,10 @@ class Config < Anyway::Config
     # @!attribute [r] pagination_limit
     #   @return [Integer]
 
-    # @!attribute [r] parallel
+    # @!attribute [r] analyzer_parallelism
+    #   @return [Boolean]
+
+    # @!attribute [r] emitter_parallelism
     #   @return [Boolean]
 
     # @!attribute [r] ignore_error

diff --git a/lib/mihari/emitters/base.rb b/lib/mihari/emitters/base.rb
@@ -23,7 +23,7 @@ def initialize(rule:, options: nil)
       # @return [Boolean]
       #
       def parallel?
-        options[:parallel] || Mihari.config.parallel
+        options[:parallel] || Mihari.config.emitter_parallelism
       end
 
       # A target to emit the data
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,4 +38,4 @@ options:

		### Parallel

		`parallel` (`bool`) controls whether to allow parallel execution or not. Optional. Defaults to `false`. Configurable via `PARALLEL` environment variable.
		`parallel` (`bool`) controls whether to allow parallel execution or not. Optional. Defaults to `true`. Configurable via `EMITTER_PARALLELISM` environment variable.