Merge pull request #98 from dial-once/feature/nbproc

Handle NBPROC optional global setting using env vars

Author: Feng Honglin

Dockerfile

@@ -22,7 +22,8 @@ ENV RSYSLOG_DESTINATION=127.0.0.1 \
     STATS_AUTH="stats:stats" \
     SSL_BIND_OPTIONS=no-sslv3 \
     SSL_BIND_CIPHERS="ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:DHE-DSS-AES128-SHA:DES-CBC3-SHA" \
-    HEALTH_CHECK="check inter 2000 rise 2 fall 3"
+    HEALTH_CHECK="check inter 2000 rise 2 fall 3" \
+    NBPROC=1
 
 EXPOSE 80 443 1936
 ENTRYPOINT ["/sbin/tini", "--"]

README.md

@@ -196,6 +196,7 @@ Settings in this part is immutable, you have to redeploy HAProxy service to make
 |STATS_AUTH|stats:stats|username and password required to access the Haproxy stats.|
 |STATS_PORT|1936|port for the HAProxy stats section. If this port is published, stats can be accessed at `http://<host-ip>:<STATS_PORT>/`
 |TIMEOUT|connect 5000, client 50000, server 50000|comma-separated list of HAProxy `timeout` entries to the `default` section.|
+|NBPROC|1|sets the `nbproc` entry to the `global` section. By default, only one process is created, which is the recommended mode of operation.|
 
 ### Settings in linked application services###
 

haproxy/config.py

@@ -60,6 +60,7 @@ def parse_extra_frontend_settings(envvars):
 STATS_AUTH = os.getenv("STATS_AUTH", "stats:stats")
 STATS_PORT = os.getenv("STATS_PORT", "1936")
 TIMEOUT = os.getenv("TIMEOUT", "connect 5000, client 50000, server 50000")
+NBPROC = int(os.getenv("NBPROC", 1))
 
 # global
 LINK_MODE = ""

haproxy/haproxycfg.py

@@ -195,6 +195,12 @@ def _config_global_section():
                       "daemon",
                       "stats socket /var/run/haproxy.stats level admin"]
 
+        if NBPROC > 1:
+            statements.append("nbproc %s" % NBPROC)
+            statements.append("stats bind-process %s" % NBPROC)
+            for x in range(1, NBPROC+1):
+                statements.append("cpu-map %s %s" % (x, x-1))
+
         statements.extend(ConfigHelper.config_ssl_bind_options(SSL_BIND_OPTIONS))
         statements.extend(ConfigHelper.config_ssl_bind_ciphers(SSL_BIND_CIPHERS))
         statements.extend(ConfigHelper.config_extra_settings(EXTRA_GLOBAL_SETTINGS))