Merge pull request #110 from drcursor/master

Allow defining the number of parallel workers

.travis.yml

@@ -4,10 +4,8 @@ env:
   - DOCKER_COMPOSE_VERSION=1.25.3
 
 before_install:
-  - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
+  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` | sudo tee /usr/local/bin/docker-compose >/dev/null
+  - sudo chmod +x /usr/local/bin/docker-compose
 
 script:
   - docker-compose -f docker-compose.yml -f build-docker-compose.yml build

docker-compose.yml

@@ -53,6 +53,7 @@ services:
 #      - "CERTAUTH=optional" # Can be set to optional or on - Step 2 of https://github.com/MISP/MISP/tree/2.4/app/Plugin/CertAuth is still required
 #      - "SECURESSL=true" # Enable higher security SSL in nginx
 #      - "MISP_MODULES_FQDN=http://misp-modules" # Set the MISP Modules FQDN, used for Enrichment_services_url/Import_services_url/Export_services_url
+#      - "WORKERS=1" #If set to a value larger than 1 this will increase the number of parallel worker processes
   misp-modules:
     image: coolacid/misp-docker:modules-latest
     environment:

server/files/entrypoint_nginx.sh

@@ -50,6 +50,11 @@ init_misp_config(){
     /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Export_services_url" "$MISP_MODULES_FQDN"
 
     /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Cortex_services_enable" false
+
+    echo Change number of workers
+    if [ ! -z "$WORKERS" ] && [ "$WORKERS" -gt "1" ]; then
+        sed -i "s/start --interval/start -n $WORKERS --interval/" /var/www/MISP/app/Console/worker/start.sh
+    fi
 }
 
 init_misp_files(){